%ghc_fix_rpath was a no-op for ghc_without_dynamic

epel9
Jens Petersen 6 years ago
parent fcee7ff4cb
commit 14a65baa2a

@ -10,7 +10,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.9.6 Version: 1.9.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
@ -175,6 +175,9 @@ EOF
%changelog %changelog
* Sun Feb 24 2019 Jens Petersen <petersen@redhat.com> - 1.9.7-1
- ghc_fix_rpath was a noop when ghc_without_dynamic
* Fri Feb 1 2019 Jens Petersen <petersen@redhat.com> - 1.9.6-1 * Fri Feb 1 2019 Jens Petersen <petersen@redhat.com> - 1.9.6-1
- disable debuginfo by undefining _enable_debug_packages - disable debuginfo by undefining _enable_debug_packages
- leave stripping to generic rpm macros - leave stripping to generic rpm macros

@ -169,7 +169,6 @@ fi\
# ghc_fix_rpath lib-ver ... # ghc_fix_rpath lib-ver ...
%ghc_fix_rpath()\ %ghc_fix_rpath()\
%if %{undefined ghc_without_dynamic}\
if ! type chrpath > /dev/null; then exit 1; fi\ if ! type chrpath > /dev/null; then exit 1; fi\
for i in $(find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\ for i in $(find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\
for lib in %*; do\ for lib in %*; do\
@ -197,7 +196,6 @@ for lib in %*; do\
fi\ fi\
done\ done\
done\ done\
%endif\
%{nil} %{nil}
# Deprecated by ghc_fix_rpath: # Deprecated by ghc_fix_rpath:

Loading…
Cancel
Save