From 4e2983c83c87a20c62c813691e2a759e6ad8b4dc Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Thu, 25 Oct 2018 00:48:27 +0900
Subject: [PATCH] disable -Werror=format-security too on s390x

cc1: error: -Wformat-security ignored without -Wformat [-Werror=format-security]
cc1: some warnings being treated as errors
`gcc' failed in phase `C Compiler'. (Exit code: 1)
---
 ghc-rpm-macros.spec | 5 ++++-
 macros.ghc          | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec
index 3716fa7..43e63e2 100644
--- a/ghc-rpm-macros.spec
+++ b/ghc-rpm-macros.spec
@@ -11,7 +11,7 @@
 
 Name:           ghc-rpm-macros
 Version:        1.9.5
-Release:        4%{?dist}
+Release:        5%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
 License:        GPLv3+
@@ -175,6 +175,9 @@ EOF
 
 
 %changelog
+* Thu Oct 25 2018 Jens Petersen <petersen@redhat.com> - 1.9.5-5
+- need to disable -Werror=format-security too on s390x
+
 * Wed Oct 24 2018 Jens Petersen <petersen@redhat.com> - 1.9.5-4
 - silence C compiler Wunused-label warnings flood on s390x again
 
diff --git a/macros.ghc b/macros.ghc
index 1e0dba9..b62f7f8 100644
--- a/macros.ghc
+++ b/macros.ghc
@@ -13,7 +13,7 @@ LANG=en_US.utf8\
 %ghc_set_gcc_flags\
 # -Wunused-label is extremely noisy\
 %ifarch s390x\
-CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //')}"\
+CFLAGS="${CFLAGS:-$(echo %optflags | sed -e 's/-Wall //' -e 's/-Werror=format-security //')}"\
 %else\
 CFLAGS="${CFLAGS:-%optflags}"\
 %endif\