diff options
Diffstat (limited to 'pin-dependencies.PKGBUILDpatch')
-rw-r--r-- | pin-dependencies.PKGBUILDpatch | 30 |
1 files changed, 18 insertions, 12 deletions
diff --git a/pin-dependencies.PKGBUILDpatch b/pin-dependencies.PKGBUILDpatch index a06c768e0..4d5540699 100644 --- a/pin-dependencies.PKGBUILDpatch +++ b/pin-dependencies.PKGBUILDpatch @@ -45,9 +45,24 @@ if printf '%s\n' "${arch[@]}" | grep -qvxF any; then | sed 's/[<>]\?=.*$//' \ | sort -u ) <( - printf '%s\n' "${_pinned_dependencies[@]}" \ - | sed 's/=.*$//' \ - | sort -u + { + eval 'printf '"'"'%s\n'"'"' "${depends[@]}" "${depends_'"${CARCH}"'[@]}"' \ + | sed 's/=.*$//' \ + | sort -u + sed -n ' + /^\s*# _pinned_dependencies$/,/^\s*# _pinned_dependencies\.end$/ p + ' "${OLDPWD}/PKGBUILD" \ + | sed ' + /^\s*#/d + s/^\s\+// + s/\s\+$// + s/^\(["'"'"']\)\(\S\+\)\1$/\2/ + s/[<>]\?=.*$// + ' \ + | sort -u + } \ + | sort \ + | uniq -d ) ); then printf 'There are discrepancies between the _pinned_dependencies and the linked libraries in %s'"'"'s %s:\n' \ @@ -64,13 +79,4 @@ if printf '%s\n' "${arch[@]}" | grep -qvxF any; then | sort -k1,1 return 1 fi - depends+=( - $( - [ "${CARCH}" = 'x86_64' ] && _suffix='-64' || _suffix='-32' - printf '%s\n' "${_pinned_dependencies[@]}" \ - | sed ' - /\.so=/ s/$/'"${_suffix}"'/ - ' - ) - ) fi |