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,7 +1516,9 @@ trace_apk_deps() {
|
||||||
if [ -f "$dir"/.rpaths ]; then
|
if [ -f "$dir"/.rpaths ]; then
|
||||||
local so_files=$(find_so_files "$dir"/.rpaths $missing) \
|
local so_files=$(find_so_files "$dir"/.rpaths $missing) \
|
||||||
|| return 1
|
|| return 1
|
||||||
deppkgs=$($APK $apkroot info --quiet --who-owns $so_files) || return 1
|
if [ ! -z $so_files ]; then
|
||||||
|
deppkgs=$($APK $apkroot info --quiet --who-owns $so_files) || return 1
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
for found in $deppkgs; do
|
for found in $deppkgs; do
|
||||||
|
|
Loading…
Reference in New Issue