disable dynlinking on aarch64 and set LDFLAGS again
This commit is contained in:
parent
deba8275bf
commit
55f359cbaa
@ -11,7 +11,7 @@
|
|||||||
|
|
||||||
Name: ghc-rpm-macros
|
Name: ghc-rpm-macros
|
||||||
Version: 1.6.9
|
Version: 1.6.9
|
||||||
Release: 6%{?dist}
|
Release: 7%{?dist}
|
||||||
Summary: RPM macros for building Haskell packages for GHC
|
Summary: RPM macros for building Haskell packages for GHC
|
||||||
|
|
||||||
License: GPLv3+
|
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 %{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
|
||||||
|
%ifarch aarch64
|
||||||
|
# dynlinking failing with ghc-7.10.3
|
||||||
|
cat >> %{buildroot}/%{macros_dir}/macros.ghc <<EOF
|
||||||
|
|
||||||
|
%%ghc_without_dynamic 1
|
||||||
|
EOF
|
||||||
|
%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
|
||||||
|
|
||||||
@ -137,6 +146,10 @@ EOF
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Oct 17 2016 Jens Petersen <petersen@redhat.com> - 1.6.9-7
|
||||||
|
- set LDFLAGS for aarch64 again
|
||||||
|
- disable dynamic linking for aarch64 since it fails
|
||||||
|
|
||||||
* 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
|
||||||
|
|
||||||
|
@ -25,8 +25,8 @@ fi
|
|||||||
%global _hardened_ldflags %{nil}\
|
%global _hardened_ldflags %{nil}\
|
||||||
%ifnarch aarch64\
|
%ifnarch aarch64\
|
||||||
CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\
|
CFLAGS="${CFLAGS:-%optflags}"; export CFLAGS\
|
||||||
LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\
|
|
||||||
%endif\
|
%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
|
%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
|
# install
|
||||||
|
Loading…
Reference in New Issue
Block a user