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

check for bindir before looking for executables in ghc_clear_execstack

Browse Source
This commit is contained in:
Jens Petersen 2013-07-11 10:41:16 +09:00
parent 49912b0df5
commit 2e67bb2ce5
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ghc-rpm-macros.ghc
View File

@ -106,7 +106,9 @@ find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \
# ghc_clear_execstack # ghc_clear_execstack
%ghc_clear_execstack\ %ghc_clear_execstack\
find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\; if [ -d "%{buildroot}%{_bindir}" ]; then\
find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\;\
fi
# install bin package # install bin package
%ghc_bin_install()\ %ghc_bin_install()\

6
ghc-rpm-macros.spec
View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1 #%%global without_hscolour 1
Name: ghc-rpm-macros Name: ghc-rpm-macros
Version: 1.0.3 Version: 1.0.4
Release: 1%{?dist} Release: 1%{?dist}
Summary: RPM macros for building packages for GHC Summary: RPM macros for building packages for GHC
@ -89,8 +89,12 @@ EOF
%changelog %changelog
* Thu Jul 11 2013 Jens Petersen <petersen@redhat.com> - 1.0.4-1
- check for bindir before looking for executables in ghc_clear_execstack
* Wed Jul 10 2013 Jens Petersen <petersen@redhat.com> - 1.0.3-1 * Wed Jul 10 2013 Jens Petersen <petersen@redhat.com> - 1.0.3-1
- add ghc_clear_execstack and use it also in ghc_lib_install (#973512) - add ghc_clear_execstack and use it also in ghc_lib_install (#973512)
and require prelink for execstack
* Tue Jul 9 2013 Jens Petersen <petersen@redhat.com> - 1.0.2-1 * Tue Jul 9 2013 Jens Petersen <petersen@redhat.com> - 1.0.2-1
- drop doc and prof obsoletes and provides from ghc_lib_subpackage - drop doc and prof obsoletes and provides from ghc_lib_subpackage