rpms/ghc-rpm-macros
6
0
Fork 0
Code Issues Pull Requests Releases Activity

only disable arm dynlinking for f26 (binutils, #1386126)

Browse Source
This commit is contained in:
Jens Petersen 2016-10-31 12:22:20 +09:00
parent 37e9abdf73
commit a3ef23ec78
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ghc-rpm-macros.spec
View File

@ -11,7 +11,7 @@
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.6.10 Version: 1.6.10
Release: 1%{?dist} Release: 2%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
License: GPLv3+ 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 install -p -D -m 0755 %{SOURCE8} %{buildroot}/%{_prefix}/lib/rpm/ghc-pkg-wrapper
# remove for ghc-8.0.1 # 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 %ifarch aarch64 armv7hl
# dynlinking failing with ghc-7.10.3 # dynlinking failing with ghc-7.10.3
cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF
@ -114,6 +117,7 @@ cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF
%%ghc_without_dynamic 1 %%ghc_without_dynamic 1
EOF EOF
%endif %endif
%endif
%if 0%{?rhel} && 0%{?rhel} < 7 %if 0%{?rhel} && 0%{?rhel} < 7
cat >> %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh <<EOF cat >> %{buildroot}/%{_prefix}/lib/rpm/ghc-deps.sh <<EOF
@ -146,15 +150,18 @@ EOF
%changelog %changelog
* Mon Oct 31 2016 Jens Petersen <petersen@redhat.com> - 1.6.10-2
- only disable arm dynlinking for f26 (#1386126)
* Wed Oct 26 2016 Jens Petersen <petersen@redhat.com> - 1.6.10-1 * Wed Oct 26 2016 Jens Petersen <petersen@redhat.com> - 1.6.10-1
- make ghc_lib_subpackage backward compatible with older 2 args form - make ghc_lib_subpackage backward compatible with older 2 args form
* Mon Oct 17 2016 Jens Petersen <petersen@redhat.com> - 1.6.9-8 * Mon Oct 17 2016 Jens Petersen <petersen@redhat.com> - 1.6.9-8
- disable dynlinking on armv7hl too - disable dynlinking on armv7hl too (#1386126)
* Mon Oct 17 2016 Jens Petersen <petersen@redhat.com> - 1.6.9-7 * Mon Oct 17 2016 Jens Petersen <petersen@redhat.com> - 1.6.9-7
- set LDFLAGS for aarch64 again - 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 <petersen@redhat.com> - 1.6.9-6 * Mon Oct 17 2016 Jens Petersen <petersen@redhat.com> - 1.6.9-6
- only pass CFLAGS and LDFLAGS to ghc if set - only pass CFLAGS and LDFLAGS to ghc if set