From 55f359cbaa7aedd6f0eb5fc47838252894ed308d Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Oct 17 2016 03:14:17 +0000 Subject: disable dynlinking on aarch64 and set LDFLAGS again --- diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 6c7d3c1..78d6678 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@ Name: ghc-rpm-macros Version: 1.6.9 -Release: 6%{?dist} +Release: 7%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -106,6 +106,15 @@ install -p -D -m 0755 %{SOURCE4} %{buildroot}/%{_bindir}/cabal-tweak-dep-ver install -p -D -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/cabal-tweak-flag install -p -D -m 0755 %{SOURCE8} %{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper +# remove for ghc-8.0.1 +%ifarch aarch64 +# dynlinking failing with ghc-7.10.3 +cat >> %{buildroot}/%{macros_dir}/macros.ghc <> %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh < - 1.6.9-7 +- set LDFLAGS for aarch64 again +- disable dynamic linking for aarch64 since it fails + * Mon Oct 17 2016 Jens Petersen - 1.6.9-6 - only pass CFLAGS and LDFLAGS to ghc if set diff --git a/macros.ghc b/macros.ghc index 7a2e352..73bbedd 100644 --- a/macros.ghc +++ b/macros.ghc @@ -25,8 +25,8 @@ fi %global _hardened_ldflags %{nil}\ %ifnarch aarch64\ CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\ -LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ %endif\ +LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\ %cabal configure %{?cabal_verbose} --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_defaultlicensedir}/%{name} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} --ghc-options="${CFLAGS:+$(echo ' '$CFLAGS | sed -e 's/ / -optc/g')} ${LDFLAGS:+$(echo ' '$LDFLAGS | sed -e 's/ / -optl/g')}" %{?cabal_configure_options} $cabal_configure_extra_options # install