From c2213a023682fb1732f6c9ee7155c1f1e1fde03a Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Sat, 28 Feb 2015 00:58:30 +0900 Subject: [PATCH] turn off hardening in %cabal_configure: set %_hardened_ldflags to %nil %ghc_lib_build* was too late --- 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 7a14def..d7d5c0d 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.4.9 +Version: 1.4.10 Release: 1%{?dist} Summary: RPM macros for building packages for GHC @@ -88,6 +88,9 @@ install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag %changelog +* Fri Feb 27 2015 Jens Petersen - 1.4.10-1 +- have to turn off hardening in cabal_configure: set _hardened_ldflags to nil + * Fri Feb 27 2015 Jens Petersen - 1.4.9-1 - turn off _hardened_build for libraries since it breaks linking diff --git a/macros.ghc b/macros.ghc index 5f213b2..756c223 100644 --- a/macros.ghc +++ b/macros.ghc @@ -21,6 +21,7 @@ fi # configure %cabal_configure\ %ghc_check_bootstrap\ +%global _hardened_ldflags %{nil}\ 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 @@ -105,7 +106,6 @@ install -D --mode=0644 %{pkgnamever}.conf %{buildroot}%{ghclibdir}/package.conf. # ghc_lib_build_without_haddock [name] [version] %ghc_lib_build_without_haddock()\ %global debug_package %{nil}\ -%global _hardened_build 0\ %cabal_configure %{!?without_prof:-p} %{!?ghc_without_shared:--enable-shared} %{?pkg_name:--htmldir=%{ghclibdocdir}/%{pkg_name}-%{version}} %{?1:--docdir=%{_docdir}/ghc-%1%{!?fedora:-%2} --htmldir=%{ghclibdocdir}/%1-%2} %{!?1:--global} %{?ghc_with_lib_for_ghci:--enable-library-for-ghci}\ %cabal build\ %{nil}