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

condition use of execstack since no prelink on ppc64le or arm64

Browse Source
This commit is contained in:
Jens Petersen 2014-05-30 18:25:07 +09:00
parent e91dddece5
commit 69ab773f59
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ghc-rpm-macros.spec
View File

@ -6,8 +6,8 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.2.10 Version: 1.2.11
Release: 2%{?dist} Release: 1%{?dist}
Summary: RPM macros for building packages for GHC Summary: RPM macros for building packages for GHC
License: GPLv3+ License: GPLv3+
@ -33,8 +33,10 @@ Requires: redhat-rpm-config > 20-1.fc21
Requires: hscolour Requires: hscolour
%endif %endif
%endif %endif
# for execstack # for execstack (hack not needed for ghc-7.8)
%ifnarch ppc64le aarch64
Requires: prelink Requires: prelink
%endif
%description %description
A set of macros for building GHC packages following the Haskell Guidelines A set of macros for building GHC packages following the Haskell Guidelines
@ -108,6 +110,9 @@ EOF
%changelog %changelog
* Fri May 30 2014 Jens Petersen <petersen@redhat.com> - 1.2.9-1
- condition use of execstack since no prelink on ppc64le or arm64
* Wed May 21 2014 Dennis Gilmore <dennis@ausil.us> - 1.2.10-2 * Wed May 21 2014 Dennis Gilmore <dennis@ausil.us> - 1.2.10-2
- add %%ghc_arches back to macros.ghc-srpm to maintain compatability with - add %%ghc_arches back to macros.ghc-srpm to maintain compatability with
- existing specs - existing specs

4
macros.ghc
View File

@ -107,8 +107,8 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
# ghc_clear_execstack # ghc_clear_execstack
%ghc_clear_execstack\ %ghc_clear_execstack\
if [ -d "%{buildroot}%{_bindir}" ]; then\ if [ -d "%{buildroot}%{_bindir}" -a -x "%{_bindir}/execstack" ]; then\
find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\;\ find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec %{_bindir}/execstack -c "{}" \\;\
fi fi
# install bin package # install bin package