mirror of
https://codeberg.org/kiss-community/kiss
synced 2024-12-25 00:20:05 -07:00
kiss: use ldd /or/ *readelf in dependency fixer rather than both
This commit is contained in:
parent
93dc3a1fcd
commit
6dad450f05
87
kiss
87
kiss
@ -126,7 +126,7 @@ sh256() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pkg_owner() {
|
pkg_owner() {
|
||||||
pkg_owner=$(grep -lFx "$@") && {
|
pkg_owner=$(grep "$@") && {
|
||||||
pkg_owner=${pkg_owner%/*}
|
pkg_owner=${pkg_owner%/*}
|
||||||
pkg_owner=${pkg_owner##*/}
|
pkg_owner=${pkg_owner##*/}
|
||||||
}
|
}
|
||||||
@ -430,11 +430,11 @@ pkg_strip() {
|
|||||||
done 2>/dev/null ||:
|
done 2>/dev/null ||:
|
||||||
}
|
}
|
||||||
|
|
||||||
pkg_fixdeps() {
|
pkg_fix_deps() {
|
||||||
# Dynamically look for missing runtime dependencies by checking each
|
# Dynamically look for missing runtime dependencies by checking each
|
||||||
# binary and library with 'ldd'. This catches any extra libraries and or
|
# binary and library with 'ldd'. This catches any extra libraries and or
|
||||||
# dependencies pulled in by the package's build suite.
|
# dependencies pulled in by the package's build suite.
|
||||||
log "$1" "Checking for missing dependencies"
|
log "$1" "Looking for dependencies (using ${elf_cmd##*/})"
|
||||||
|
|
||||||
cd "$pkg_dir/$1/$pkg_db/$1"
|
cd "$pkg_dir/$1/$pkg_db/$1"
|
||||||
|
|
||||||
@ -446,49 +446,48 @@ pkg_fixdeps() {
|
|||||||
find "$pkg_dir/${PWD##*/}/" -type f 2>/dev/null |
|
find "$pkg_dir/${PWD##*/}/" -type f 2>/dev/null |
|
||||||
|
|
||||||
while read -r file; do
|
while read -r file; do
|
||||||
ldd "$file" 2>/dev/null |
|
case ${elf_cmd##*/} in
|
||||||
|
*readelf)
|
||||||
|
"$elf_cmd" -d "$file"
|
||||||
|
;;
|
||||||
|
|
||||||
while read -r _ _ dep _; do
|
*)
|
||||||
# Resolve path symlinks to find the real location to the library.
|
ldd "$file"
|
||||||
cd -P "$KISS_ROOT/${dep%/*}" 2>/dev/null ||
|
;;
|
||||||
continue
|
esac 2>/dev/null |
|
||||||
|
|
||||||
# Skip files owned by libc and POSIX.
|
while read -r line; do
|
||||||
case ${dep##*/} in
|
case $line in
|
||||||
ld-* |\
|
*NEEDED*\[*\] | *'=>'*)
|
||||||
lib[cm].so* |\
|
# readelf: 0x0000 (NEEDED) Shared library: [libjson-c.so.5]
|
||||||
libdl.so* |\
|
line=${line##*[}
|
||||||
libpthread.so* |\
|
line=${line%%]*}
|
||||||
librt.so* |\
|
|
||||||
libtrace.so* |\
|
|
||||||
libxnet.so* |\
|
|
||||||
"")
|
|
||||||
continue
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
|
|
||||||
# Check if ldd result is direct dependency of package.
|
# ldd: libjson-c.so.5 => /lib/libjson-c.so.5 ...
|
||||||
case $elf_cmd in
|
line=${line##*=> }
|
||||||
*readelf)
|
line=${line%% *}
|
||||||
"$elf_cmd" -d "$file" |
|
|
||||||
grep -q "NEEDED.* \[${dep##*/}\]"
|
|
||||||
;;
|
|
||||||
esac || continue
|
|
||||||
|
|
||||||
# Figure out which package owns the file.
|
# Skip files owned by libc and POSIX.
|
||||||
pkg_owner "${PWD#"$KISS_ROOT"}/${dep##*/}" "$@" ||
|
case ${line##*/} in
|
||||||
continue
|
ld-* |\
|
||||||
|
lib[cm].so* |\
|
||||||
|
libdl.so* |\
|
||||||
|
libpthread.so* |\
|
||||||
|
librt.so* |\
|
||||||
|
libtrace.so* |\
|
||||||
|
libxnet.so* )
|
||||||
|
continue
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
case $pkg_owner in
|
pkg_owner -l "/${line#/}\$" "$@" || continue
|
||||||
gcc | \
|
|
||||||
llvm | \
|
case $pkg_owner in
|
||||||
"$pkg" | \
|
gcc | llvm | "$pkg")
|
||||||
"${pkg%%-bin}" | \
|
continue
|
||||||
"${pkg%%-git}" )
|
;;
|
||||||
# Do nothing.
|
esac
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
printf '%s\n' "$pkg_owner"
|
printf '%s\n' "$pkg_owner"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
@ -683,7 +682,7 @@ pkg_build() {
|
|||||||
: > "$pkg_dir/$pkg/$pkg_db/$pkg/etcsums"
|
: > "$pkg_dir/$pkg/$pkg_db/$pkg/etcsums"
|
||||||
|
|
||||||
pkg_strip "$pkg"
|
pkg_strip "$pkg"
|
||||||
pkg_fixdeps "$pkg"
|
pkg_fix_deps "$pkg"
|
||||||
pkg_manifest "$pkg"
|
pkg_manifest "$pkg"
|
||||||
pkg_etcsums "$pkg"
|
pkg_etcsums "$pkg"
|
||||||
pkg_tar "$pkg"
|
pkg_tar "$pkg"
|
||||||
@ -893,7 +892,7 @@ pkg_swap() {
|
|||||||
# another package's. Print the full path to the manifest file which
|
# another package's. Print the full path to the manifest file which
|
||||||
# contains the match to our search.
|
# contains the match to our search.
|
||||||
set +f
|
set +f
|
||||||
pkg_owner "$2" "$sys_db/"*/manifest ||
|
pkg_owner -lFx "$2" "$sys_db/"*/manifest ||
|
||||||
die "File '$2' exists on filesystem but isn't owned"
|
die "File '$2' exists on filesystem but isn't owned"
|
||||||
set -f
|
set -f
|
||||||
|
|
||||||
@ -1514,11 +1513,11 @@ main() {
|
|||||||
)"} || su=su
|
)"} || su=su
|
||||||
|
|
||||||
# Figure out which utility is available to dump elf information.
|
# Figure out which utility is available to dump elf information.
|
||||||
elf_cmd=${KISS_ELFCMD:="$(
|
elf_cmd=${KISS_ELF:="$(
|
||||||
command -v readelf ||
|
command -v readelf ||
|
||||||
command -v eu-readelf ||
|
command -v eu-readelf ||
|
||||||
command -v llvm-readelf
|
command -v llvm-readelf
|
||||||
)"} ||:
|
)"} || elf_cmd=ldd
|
||||||
|
|
||||||
# Store the date and time of script invocation to be used as the name of
|
# Store the date and time of script invocation to be used as the name of
|
||||||
# the log files the package manager creates uring builds.
|
# the log files the package manager creates uring builds.
|
||||||
|
Loading…
Reference in New Issue
Block a user