rename %ghc_fix_rpaths to %ghc_delete_rpaths
This commit is contained in:
parent
9e31d7dd7d
commit
cc8736d28d
@ -191,7 +191,7 @@ EOF
|
|||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Jun 7 2021 Jens Petersen <petersen@redhat.com> - 2.2.0-1
|
* Mon Jun 7 2021 Jens Petersen <petersen@redhat.com> - 2.2.0-1
|
||||||
- ghc_fix_rpaths macro deletes all RPATHs, replacing ghc_fix_rpath(), for
|
- ghc_delete_rpaths macro replaces ghc_fix_rpath(), needed for
|
||||||
https://fedoraproject.org/wiki/Changes/Broken_RPATH_will_fail_rpmbuild
|
https://fedoraproject.org/wiki/Changes/Broken_RPATH_will_fail_rpmbuild
|
||||||
|
|
||||||
* Wed Mar 24 2021 Jens Petersen <petersen@redhat.com> - 2.1.0-1
|
* Wed Mar 24 2021 Jens Petersen <petersen@redhat.com> - 2.1.0-1
|
||||||
|
14
macros.ghc
14
macros.ghc
@ -167,7 +167,7 @@ fi\
|
|||||||
%{!?_fileattrsdir:%global _use_internal_dependency_generator 0}\
|
%{!?_fileattrsdir:%global _use_internal_dependency_generator 0}\
|
||||||
%{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\
|
%{!?_fileattrsdir:%global __find_requires %{_rpmconfigdir}/ghc-deps.sh %{buildroot}%{ghclibdir}}\
|
||||||
%cabal_install\
|
%cabal_install\
|
||||||
%ghc_fix_rpaths\
|
%ghc_delete_rpaths\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# ghc_lib_install [name] [version]
|
# ghc_lib_install [name] [version]
|
||||||
@ -178,19 +178,19 @@ fi\
|
|||||||
%cabal_install\
|
%cabal_install\
|
||||||
%cabal_pkg_conf %{?1} %{?2}\
|
%cabal_pkg_conf %{?1} %{?2}\
|
||||||
%ghc_gen_filelists %{?1} %{?2}\
|
%ghc_gen_filelists %{?1} %{?2}\
|
||||||
%ghc_fix_rpaths\
|
%ghc_delete_rpaths\
|
||||||
%{nil}
|
%{nil}
|
||||||
|
|
||||||
# ghc_fix_rpaths
|
# ghc_delete_rpaths
|
||||||
%ghc_fix_rpaths\
|
%ghc_delete_rpaths\
|
||||||
%if %{undefined disable_ghc_fix_rpaths}\
|
%if %{undefined disable_ghc_delete_rpaths}\
|
||||||
echo "running ghc_fix_rpaths:"\
|
echo "running ghc_delete_rpaths:"\
|
||||||
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 -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\
|
for i in $(find %{buildroot} -type f -executable -exec sh -c "file {} | grep -q 'dynamically linked'" \\; -print); do\
|
||||||
if [ -x "$i" ]; then\
|
if [ -x "$i" ]; then\
|
||||||
chrpath -d $i\
|
chrpath -d $i\
|
||||||
else\
|
else\
|
||||||
echo "%%ghc_fix_rpath: no $i executable"\
|
echo "%%ghc_delete_rpath: no $i executable"\
|
||||||
exit 1\
|
exit 1\
|
||||||
fi\
|
fi\
|
||||||
done\
|
done\
|
||||||
|
Loading…
Reference in New Issue
Block a user