jcgruenhage/void-packages
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hooks/generate-runtime-deps: if required shlib is provided by any subpkg, use it.

Browse source
This commit is contained in:
Juan RP 2014-05-23 11:46:46 +02:00
parent 4652752ec5
commit c093b9f521
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
common/hooks/post-install/04-generate-runtime-deps.sh
View file

@ -34,7 +34,7 @@ hook() {
local depsftmp f j tmplf mapshlibs sorequires local depsftmp f j tmplf mapshlibs sorequires
# Disable trap on ERR, xbps-uhelper cmd might return error... but not something # Disable trap on ERR, xbps-uhelper cmd might return error... but not something
# to be worried about because if there are broken shlibs this hooks returns # to be worried about because if there are broken shlibs this hook returns
# error via msg_error(). # error via msg_error().
trap - ERR trap - ERR
@ -100,9 +100,12 @@ hook() {
for j in ${rdep}; do for j in ${rdep}; do
_pkgname=$($XBPS_UHELPER_CMD getpkgname "$j") _pkgname=$($XBPS_UHELPER_CMD getpkgname "$j")
# if there's a SONAME matching pkgname, use it. # if there's a SONAME matching pkgname, use it.
[ "${pkgname}" != "${_pkgname}" ] && continue for f in ${pkgname} ${subpackages}; do
if [ "${_pkgname}" = "${f}" ]; then
found=1 found=1
break break
fi
done
done done
if [ -n "$found" ]; then if [ -n "$found" ]; then
_rdep=$j _rdep=$j