remove ghc_clear_execstack since it doesn't seem to affect ghc-7.4.1 or f18

This commit is contained in:
Jens Petersen 2013-07-11 15:58:30 +09:00
parent b9fd393c2a
commit 18055a44a4
2 changed files with 5 additions and 9 deletions

View File

@ -238,19 +238,12 @@ This package contains the development files.
find %{buildroot} -type f -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -exec strip "{}" \\;\
%endif
# ghc_clear_execstack
%ghc_clear_execstack\
if [ -d "%{buildroot}%{_bindir}" ]; then\
find %{buildroot}%{_bindir} -type f -exec sh -c "file {} | grep -q ' ELF '" \\; -exec execstack -c "{}" \\;\
fi
# install bin package
%ghc_bin_install()\
%global _use_internal_dependency_generator 0\
%global __find_requires %{_rpmconfigdir}/ghc-deps.sh --requires %{buildroot}%{ghclibdir}\
%cabal_install\
%{!?1:%ghc_strip_dynlinked}\
%{!?1:%ghc_clear_execstack}\
%{nil}
# ghc_lib_install [name] [version]
@ -262,7 +255,6 @@ fi
%cabal_pkg_conf\
%ghc_gen_filelists\
%{!?1:%ghc_strip_dynlinked}\
%{!?1:%ghc_clear_execstack}\
%{nil}
# ghc_fix_dynamic_rpath prog ...

View File

@ -6,7 +6,7 @@
#%%global without_hscolour 1
Name: ghc-rpm-macros
Version: 0.95.12
Version: 0.95.13
Release: 1%{?dist}
Summary: RPM macros for building packages for GHC
@ -76,6 +76,10 @@ EOF
%changelog
* Thu Jul 11 2013 Jens Petersen <petersen@redhat.com> - 0.95.13-1
- remove ghc_clear_execstack since the executable stack issue does seem
to happen with ghc-7.4.1
* Thu Jul 11 2013 Jens Petersen <petersen@redhat.com> - 0.95.12-1
- add new ghc_clear_execstack to ghc_bin_install and ghc_lib_install (#973512)
and require prelink for execstack