bonsai/kiss
3
0
Fork 0
forked from kiss-community/kiss
Code Issues 2 Pull Requests Projects Releases Activity

pkg_fix_deps: simplify path resolution

Browse Source
This commit is contained in:
Dylan Araps 2021-06-28 09:38:03 +00:00
parent 4de133f546
commit a25725530a
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kiss
View File

@ -460,13 +460,15 @@ pkg_fix_deps() {
find "$pkg_dir/${PWD##*/}/" -type f 2>/dev/null |
while read -r file; do
ldd_buf=$(ldd -- "$file" 2>/dev/null) ||:
case $elf_cmd in
*readelf)
"$elf_cmd" -d "$file"
;;
*)
ldd -- "$file"
printf '%s\n' "$ldd_buf"
;;
esac 2>/dev/null |
@ -474,11 +476,15 @@ pkg_fix_deps() {
case $line in
*NEEDED*\[*\] | *'=>'*)
# readelf: 0x0000 (NEEDED) Shared library: [libjson-c.so.5]
line=${line##*[}
line=${line%%]*}
line=${line##*\[}
line=${line%%\]*}
# ldd: libjson-c.so.5 => /lib/libjson-c.so.5 ...
line=${line##*=> }
# Resolve library path.
# ldd: libjson-c.so.5 => /lib/libjson-c.so.5 ...
case $elf_cmd in
*readelf) line=${ldd_buf#*" $line => "} ;;
*) line=${line##*=> } ;;
esac
line=${line%% *}
# Skip files owned by libc and POSIX.