From 3df2d9cc3c6dd5868d55ae091b29e16cef0441cf Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 19 Jan 2015 14:14:29 +0900 Subject: [PATCH] exclude -Wall from CFLAGS to prevent Cabal configure warning with ghc-7.6 see #1175667: In function 'foo': warning: control reaches end of non-void function [-Wreturn-type] --- ghc-rpm-macros.spec | 6 +++++- macros.ghc | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 79fb939..451494c 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -6,7 +6,7 @@ #%%global without_hscolour 1 Name: ghc-rpm-macros -Version: 1.2.17 +Version: 1.2.18 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -102,6 +102,10 @@ EOF %changelog +* Mon Jan 19 2015 Jens Petersen - 1.2.18-1 +- exclude -Wall from CFLAGS to prevent Cabal configure warning with ghc-7.6 + (#1175667) + * Fri Nov 14 2014 Jens Petersen - 1.2.17-1 - split ghc.attr into ghc_lib.attr and ghc_bin.attr for finer grained handling - require ghc-compiler for ghc_version diff --git a/macros.ghc b/macros.ghc index aa0e19a..1e45565 100644 --- a/macros.ghc +++ b/macros.ghc @@ -23,7 +23,7 @@ fi %ghc_check_bootstrap\ CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ LDFLAGS="${LDFLAGS:-%__global_ldflags}"; export LDFLAGS\ -%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options +%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{?_pkgdocdir}%{!?_pkgdocdir:%{_docdir}/%{name}-%{version}} --libsubdir='$compiler/$pkgid' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="$(echo ' '$CFLAGS | sed -e 's/-Wall -Werror=format-security //' -e 's/ / -optc/g') $(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')" %{?cabal_configure_options} $cabal_configure_extra_options # install %cabal_install %cabal copy --destdir=%{buildroot} -v