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

no longer need to prune -z defs from LDFLAGS

Browse Source
This commit is contained in:
Jens Petersen 2018-02-04 00:06:56 +09:00
parent ca7fad4882
commit 47ac404ddc
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ghc-rpm-macros.spec
View File

@ -10,7 +10,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.8.6 Version: 1.8.7
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building Haskell packages for GHC Summary: RPM macros for building Haskell packages for GHC
@ -162,6 +162,9 @@ EOF
%changelog %changelog
* Sat Feb 3 2018 Jens Petersen <petersen@redhat.com> - 1.8.7-1
- no longer need to prune -z defs from LDFLAGS
* Mon Jan 29 2018 Jens Petersen <petersen@redhat.com> - 1.8.6-1 * Mon Jan 29 2018 Jens Petersen <petersen@redhat.com> - 1.8.6-1
- cabal-tweak-drop-dep: quote grep pattern to allow whitespace - cabal-tweak-drop-dep: quote grep pattern to allow whitespace

2
macros.ghc
View File

@ -37,7 +37,7 @@ export CFLAGS\
%ghc_check_bootstrap\ %ghc_check_bootstrap\
%ghc_set_cflags\ %ghc_set_cflags\
%global _hardened_ldflags %{nil}\ %global _hardened_ldflags %{nil}\
LDFLAGS="${LDFLAGS:-$(echo %{?__global_ldflags} | sed -e 's/-Wl,-z,defs//')}"; export LDFLAGS\ LDFLAGS="${LDFLAGS:-%{?__global_ldflags}}"; export LDFLAGS\
%cabal --version\ %cabal --version\
%cabal configure --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{?_ghcdynlibdir:--dynlibdir=%{_ghcdynlibdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --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 --prefix=%{_prefix} --libdir=%{_libdir} --docdir=%{_ghcdocdir} --libsubdir='$compiler/$pkgkey' --datasubdir='$pkgid' --ghc %{?_ghcdynlibdir:--dynlibdir=%{_ghcdynlibdir}} %{!?ghc_without_dynamic:--enable-executable-dynamic} %{?with_tests:--enable-tests} %{?ghc_subpackaging:--user}%{!?ghc_subpackaging:--global} --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