common/hooks/pre-pkg/04-generate-runtime-deps: fix shlib_requires
shlibs from the shlib_requires variable were being added *before* the detected shlibs were loaded, so it overrode shlib_requires completely
This commit is contained in:
@@ -93,16 +93,16 @@ 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
|
||||
|
||||
_shlibtmp=$(mktemp) || exit 1
|
||||
parse_shlib_needed 3>&1 >"$_shlibtmp" <"$depsftmp"
|
||||
rm -f "$depsftmp"
|
||||
verify_deps=$(sort <"$_shlibtmp" | uniq)
|
||||
rm -f "$_shlibtmp"
|
||||
|
||||
for f in ${shlib_requires}; do
|
||||
verify_deps+=" ${f}"
|
||||
done
|
||||
|
||||
#
|
||||
# Add required run time packages by using required shlibs resolved
|
||||
# above, the mapping is done thru the common/shlibs file.
|
||||
|
||||
Reference in New Issue
Block a user