%ghc_fix_rpath: remove _libdir

This commit is contained in:
Jens Petersen 2019-07-15 16:33:38 +00:00
parent e046298ce0
commit 1862405783
1 changed files with 10 additions and 2 deletions

View File

@ -157,6 +157,7 @@ fi\
# ghc_fix_rpath lib-ver ... # ghc_fix_rpath lib-ver ...
%ghc_fix_rpath()\ %ghc_fix_rpath()\
%if %{undefined disable_ghc_fix_rpath}\
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\
for lib in %*; do\ for lib in %*; do\
@ -175,7 +176,14 @@ for lib in %*; do\
syspath="" ;;\ syspath="" ;;\
esac\ esac\
newrpath=$(echo $rpath | sed -e "s@$PWD/$lib/dist/build@${syspath}@g" -e "s/::/:/" -e "s/^://" -e "s/:$//")\ newrpath=$(echo $rpath | sed -e "s@$PWD/$lib/dist/build@${syspath}@g" -e "s/::/:/" -e "s/^://" -e "s/:$//")\
chrpath -r $newrpath $i\ if [ "$newrpath" = "%{_libdir}" ]; then\
chrpath -d $i\
else\
chrpath -r $newrpath $i\
fi\
;;\
%{_libdir})\
chrpath -d $i\
;;\ ;;\
esac\ esac\
else\ else\
@ -184,7 +192,7 @@ for lib in %*; do\
fi\ fi\
done\ done\
done\ done\
%{nil} %endif
# deprecated for f31 # deprecated for f31
%ghc_pkg_recache %{_bindir}/ghc-pkg-%{ghc_version} recache --no-user-package-db || : %ghc_pkg_recache %{_bindir}/ghc-pkg-%{ghc_version} recache --no-user-package-db || :