diff options
author | Đoàn Trần Công Danh <congdanhqx@gmail.com> | 2022-11-09 08:09:12 +0000 |
---|---|---|
committer | Đoàn Trần Công Danh <sgn.danh@gmail.com> | 2022-11-30 16:22:16 +0000 |
commit | 2111dfa8150a72fb180450d18705b0165f703b4d (patch) | |
tree | 07441de3960c25d332409003f08f4649a009b9df | |
parent | 1b2519f7657df7398a0e3824ee790c883ad042aa (diff) | |
download | void-packages-2111dfa8150a72fb180450d18705b0165f703b4d.tar void-packages-2111dfa8150a72fb180450d18705b0165f703b4d.tar.gz void-packages-2111dfa8150a72fb180450d18705b0165f703b4d.tar.bz2 void-packages-2111dfa8150a72fb180450d18705b0165f703b4d.tar.lz void-packages-2111dfa8150a72fb180450d18705b0165f703b4d.tar.xz void-packages-2111dfa8150a72fb180450d18705b0165f703b4d.tar.zst void-packages-2111dfa8150a72fb180450d18705b0165f703b4d.zip |
gen-runtime-deps: verify rdeps for shlib_requires too
While we're at it, mark one more variables as local
-rw-r--r-- | common/hooks/pre-pkg/04-generate-runtime-deps.sh | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/common/hooks/pre-pkg/04-generate-runtime-deps.sh b/common/hooks/pre-pkg/04-generate-runtime-deps.sh index 8eace6c683e..a291f2ccc87 100644 --- a/common/hooks/pre-pkg/04-generate-runtime-deps.sh +++ b/common/hooks/pre-pkg/04-generate-runtime-deps.sh @@ -46,7 +46,7 @@ store_pkgdestdir_rundeps() { } hook() { - local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs + local depsftmp f lf j mapshlibs sorequires _curdep elfmagic broken_shlibs verify_deps # Disable trap on ERR, xbps-uhelper cmd might return error... but not something # to be worried about because if there are broken shlibs this hook returns @@ -63,6 +63,10 @@ hook() { depsftmp=$(mktemp) || exit 1 find ${PKGDESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null + for f in ${shlib_requires}; do + verify_deps+=" ${f}" + done + exec 3<&0 # save stdin exec < $depsftmp while read f; do @@ -161,9 +165,6 @@ hook() { store_pkgdestdir_rundeps - for f in ${shlib_requires}; do - sorequires+="${f} " - done if [ -n "${sorequires}" ]; then echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires fi |