diff options
author | Erich Eckner <git@eckner.net> | 2018-05-16 09:12:40 +0200 |
---|---|---|
committer | Erich Eckner <git@eckner.net> | 2018-05-16 09:12:40 +0200 |
commit | e10e9e19ff9dacc237c161a68f7253217288a290 (patch) | |
tree | 39b77e3895b221395bb166dd138f8871661970ef | |
parent | 4f20aac08b4ce0ffb6f3ffe285e8eba86875c187 (diff) | |
download | builder-e10e9e19ff9dacc237c161a68f7253217288a290.tar.xz |
lib/common-functions: remove "lib32-" from dependencies instead of inserting command to remove - this should make "makepkg --printsrcinfo" succeed.
-rwxr-xr-x | lib/common-functions | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/lib/common-functions b/lib/common-functions index 7194abb..4224831 100755 --- a/lib/common-functions +++ b/lib/common-functions @@ -367,18 +367,16 @@ mangle_pkgbuild() { s/^\(\s*pkgrel=\)['"'"'"]\?\([0-9.]\+\)['"'"'"]\?\s*\(#.*\)\?$/\1"\2'"${sub_pkgrel}"'"/ ' "${PKGBUILD}" -# TODO: this interferes with "makepkg --printsrcinfo" - while the PKGBUILD works as intended, -# depends will/may become empty - see for example make_source_info python-numpy extra 206b8d75680b579f547b9d588e63eb6f7c6c58e6 5b5a33cf88d0bba4bb363f8cffe12c56c9771361 /tmp/bla/SRCINFO - sed -i ' - /^\s*\(\(make\|check\|opt\|\)depends\)=(/ { + /^\s*\(make\|check\|opt\|\)depends\(_[^=[:space:]]\+\)\?=(/ { :a - s,^\s*\(\S[^=]*\)=(\([^()]*\(#[^\n]*\n\)\?\)*),\0\n\1=("${\1[\@]/lib32-/}")\n, - t - $! { - N - ba + /^\s*\(\S[^=]*\)=(\([^()]*\(#[^\n]*\n\)\?\)*)/! { + $! { + N + ba + } } + s/\(["'"'"'([:space:]]\)lib32-/\1/g } ' "${PKGBUILD}" } |