From 344ad656e75fc61525db7e58e692d7a9412a740e Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 4 Jan 2019 16:07:39 +0100 Subject: pin-dependencies.PKGBUILDpatch: only run for non-any packages --- pin-dependencies.PKGBUILDpatch | 62 ++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 30 deletions(-) (limited to 'pin-dependencies.PKGBUILDpatch') diff --git a/pin-dependencies.PKGBUILDpatch b/pin-dependencies.PKGBUILDpatch index a21ba059..54553a7d 100644 --- a/pin-dependencies.PKGBUILDpatch +++ b/pin-dependencies.PKGBUILDpatch @@ -1,33 +1,35 @@ -_depends=( - $( - { - printf '%s\n' "${depends[@]}" - find "${pkgdir}" -type f -exec objdump -x {} \; 2>/dev/null \ +if printf '%s\n' "${arch[@]}" | grep -qvxF any; then + _depends=( + $( + { + printf '%s\n' "${depends[@]}" + find "${pkgdir}" -type f -exec objdump -x {} \; 2>/dev/null \ + | sed ' + s/^\s*NEEDED\s\+\(\S\+\)\s*$/\1/ + t + d + ' \ + | sort -u \ + | while read -r _lib; do + pacman -Qqo "/usr/lib/${_lib}" 2>/dev/null || true + done \ + | sort -u \ + | xargs -r pacman -Q \ + | sed ' + s/ \([^-]\+\)-[^-]\+$/=\1/ + t + w /dev/stderr + d + ' + } \ | sed ' - s/^\s*NEEDED\s\+\(\S\+\)\s*$/\1/ - t - d + s/^\([^=[:space:]]\+\)\(=\(\S\+\)\)\?$/\0 \1 \3/ ' \ - | sort -u \ - | while read -r _lib; do - pacman -Qqo "/usr/lib/${_lib}" 2>/dev/null || true - done \ - | sort -u \ - | xargs -r pacman -Q \ - | sed ' - s/ \([^-]\+\)-[^-]\+$/=\1/ - t - w /dev/stderr - d - ' - } \ - | sed ' - s/^\([^=[:space:]]\+\)\(=\(\S\+\)\)\?$/\0 \1 \3/ - ' \ - | sort -k2,2 -k3Vr,3 \ - | cut -d' ' -f1,2 \ - | uniq -f1 \ - | cut -d' ' -f1 + | sort -k2,2 -k3Vr,3 \ + | cut -d' ' -f1,2 \ + | uniq -f1 \ + | cut -d' ' -f1 + ) ) -) -depends=("${_depends[@]}") + depends=("${_depends[@]}") +fi -- cgit v1.2.3-54-g00ecf