From a3ef23ec7870903345fbf39110c9300b56de45a2 Mon Sep 17 00:00:00 2001 From: Jens Petersen Date: Mon, 31 Oct 2016 12:22:20 +0900 Subject: [PATCH] only disable arm dynlinking for f26 (binutils, #1386126) --- ghc-rpm-macros.spec | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/ghc-rpm-macros.spec b/ghc-rpm-macros.spec index 20dc9dd..cec6d10 100644 --- a/ghc-rpm-macros.spec +++ b/ghc-rpm-macros.spec @@ -11,7 +11,7 @@ Name: ghc-rpm-macros Version: 1.6.10 -Release: 1%{?dist} +Release: 2%{?dist} Summary: RPM macros for building Haskell packages for GHC License: GPLv3+ @@ -107,6 +107,9 @@ 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 +# binutils-2.27-7.fc26 and later break Haskell dynamic linking on aarch64 and armv7hl +# https://bugzilla.redhat.com/show_bug.cgi?id=1386126 +%if 0%{?fedora} == 26 %ifarch aarch64 armv7hl # dynlinking failing with ghc-7.10.3 cat >> %{buildroot}/%{macros_dir}/macros.ghc <> %{buildroot}/%{macros_dir}/macros.ghc <> %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh < - 1.6.10-2 +- only disable arm dynlinking for f26 (#1386126) + * Wed Oct 26 2016 Jens Petersen - 1.6.10-1 - make ghc_lib_subpackage backward compatible with older 2 args form * Mon Oct 17 2016 Jens Petersen - 1.6.9-8 -- disable dynlinking on armv7hl too +- disable dynlinking on armv7hl too (#1386126) * Mon Oct 17 2016 Jens Petersen - 1.6.9-7 - set LDFLAGS for aarch64 again -- disable dynamic linking for aarch64 since it fails +- disable dynamic linking for aarch64 since it fails (#1386126) * Mon Oct 17 2016 Jens Petersen - 1.6.9-6 - only pass CFLAGS and LDFLAGS to ghc if set