kiss-community/kiss
1
0
Fork 1
mirror of https://codeberg.org/kiss-community/kiss synced 2024-12-24 16:10:05 -07:00
Code Issues Wiki

kiss: made fixdeps() aware of dependency chain

Browse Source
This commit is contained in:
Dylan Araps 2020-09-25 20:27:32 +03:00
parent a1de34d781
commit e76b71521c
No known key found for this signature in database
GPG Key ID: 46D62DD9F1DE636E
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
kiss
View File

@ -367,8 +367,16 @@ pkg_depends() {
while read -r dep _ || [ "$dep" ]; do while read -r dep _ || [ "$dep" ]; do
case $dep in case $dep in
[!#]*) [!#]*)
pkg_list "$dep" >/dev/null 2>&1 || case $2 in
pkg_depends "$dep" show-installed)
pkg_depends "$dep" "$2"
;;
*)
pkg_list "$dep" >/dev/null 2>&1 ||
pkg_depends "$dep"
;;
esac
;; ;;
esac esac
done < "$repo_dir/depends" done < "$repo_dir/depends"
@ -417,7 +425,7 @@ pkg_strip() {
# symbol entries which makes this safe to do. # symbol entries which makes this safe to do.
*177*E*L*F*0000020\ 00[23]\ *) *177*E*L*F*0000020\ 00[23]\ *)
strip -s -R .comment -R .note "$file" strip -s -R .comment -R .note "$file"
printf 'stripped all .%s\n' "${file##"$pkg_dir/$1"}" printf 'stripped all .%s\n' "${file##"$pkg_dir/$1"}"
;; ;;
esac esac
done 2>/dev/null ||: done 2>/dev/null ||:
@ -436,6 +444,11 @@ pkg_fixdeps() {
: >> depends : >> depends
# Generate list of all dependencies.
deps="gcc llvm"
pkg_depends "$pkg" show-installed
deps="$deps $pkg ${pkg%%-bin} ${pkg%%-git}"
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
@ -464,21 +477,8 @@ pkg_fixdeps() {
dep=${dep%/*} dep=${dep%/*}
dep=${dep##*/} dep=${dep##*/}
# Skip listing some packages as dependencies. # Only list dependencies not mentioned in any (nested) depends file.
case $dep in contains "$deps" "$dep" || printf '%s\n' "$dep"
gcc |\
llvm |\
"${pkg%%-bin}" |\
"${pkg%%-esr}" |\
"${pkg%%-esr-bin}" |\
"")
continue
;;
*)
printf '%s\n' "$dep"
;;
esac
done ||: done ||:
done | done |