snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 2 Actions Activity

gen-runtime-deps: verify rdeps for shlib_requires too 

While we're at it, mark one more variables as local
This commit is contained in:
Đoàn Trần Công Danh 2022-11-09 15:09:12 +07:00 committed by Đoàn Trần Công Danh
parent 1b2519f765
commit 2111dfa815
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
common/hooks/pre-pkg/04-generate-runtime-deps.sh
View File

@ -46,7 +46,7 @@ store_pkgdestdir_rundeps() {
} }
hook() { 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 # 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 # to be worried about because if there are broken shlibs this hook returns
@ -63,6 +63,10 @@ hook() {
depsftmp=$(mktemp) || exit 1 depsftmp=$(mktemp) || exit 1
find ${PKGDESTDIR} -type f -perm -u+w > $depsftmp 2>/dev/null 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 3<&0 # save stdin
exec < $depsftmp exec < $depsftmp
while read f; do while read f; do
@ -161,9 +165,6 @@ hook() {
store_pkgdestdir_rundeps store_pkgdestdir_rundeps
for f in ${shlib_requires}; do
sorequires+="${f} "
done
if [ -n "${sorequires}" ]; then if [ -n "${sorequires}" ]; then
echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires echo "${sorequires}" | xargs -n1 | sort | xargs > ${PKGDESTDIR}/shlib-requires
fi fi