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

kiss: depends fixer nits

Browse Source
This commit is contained in:
Dylan Araps 2021-07-20 19:50:50 +03:00
parent d5a835e8e3
commit 62e3d9426d
No known key found for this signature in database
GPG Key ID: 13295DAC2CF13B5C
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
kiss
View File

@ -662,12 +662,12 @@ pkg_fix_deps() {
# The readelf mode requires ldd's output to resolve the library # The readelf mode requires ldd's output to resolve the library
# path for a given file. If ldd fails, silently skip the file. # path for a given file. If ldd fails, silently skip the file.
ldd_buf=$(ldd -- "$_file" 2>/dev/null) || continue ldd=$(ldd -- "$pkg_dir/$repo_name$_file" 2>/dev/null) || continue
# Attempt to get information from readelf. If this fails (or we # Attempt to get information from readelf. If this fails (or we
# are in ldd mode), do full ldd mode (which has the downside of # are in ldd mode), do full ldd mode (which has the downside of
# listing dependencies of dependencies (and so on)). # listing dependencies of dependencies (and so on)).
elf_buf=$("$cmd_elf" -d "$_file" 2>/dev/null) || elf_buf=$ldd_buf elf=$("$cmd_elf" -d "$pkg_dir/$repo_name$_file" 2>/dev/null) || elf=$ldd
# Iterate over the output of readelf or ldd, extract file names, # Iterate over the output of readelf or ldd, extract file names,
# resolve their paths and finally, figure out their owner. # resolve their paths and finally, figure out their owner.
@ -679,7 +679,7 @@ pkg_fix_deps() {
# Resolve library path. # Resolve library path.
# ldd: libjson-c.so.5 => /lib/libjson-c.so.5 ... # ldd: libjson-c.so.5 => /lib/libjson-c.so.5 ...
case $cmd_elf in case $cmd_elf in
*readelf) lib=${ldd_buf#*" $lib => "} ;; *readelf) lib=${ldd#*" $lib => "} ;;
*) lib=${lib##*=> } ;; *) lib=${lib##*=> } ;;
esac esac
lib=${lib%% *} lib=${lib%% *}
@ -711,7 +711,7 @@ pkg_fix_deps() {
printf '%s\n' "$_owns" printf '%s\n' "$_owns"
esac done <<EOF || : esac done <<EOF || :
$elf_buf $elf
EOF EOF
esac done < manifest | esac done < manifest |