Merge branch 'nitsky-master-patch-69562' into 'master'
Do not invoke apk if no .so files are found in .rpaths. See merge request alpine/abuild!130
This commit is contained in:
commit
880cdbd5f7
|
@ -1516,8 +1516,10 @@ trace_apk_deps() {
|
|||
if [ -f "$dir"/.rpaths ]; then
|
||||
local so_files=$(find_so_files "$dir"/.rpaths $missing) \
|
||||
|| return 1
|
||||
if [ ! -z $so_files ]; then
|
||||
deppkgs=$($APK $apkroot info --quiet --who-owns $so_files) || return 1
|
||||
fi
|
||||
fi
|
||||
|
||||
for found in $deppkgs; do
|
||||
if grep -w "^depend = ${found}$" "$dir"/.PKGINFO >/dev/null ; then
|
||||
|
|
Loading…
Reference in New Issue