From 3c7219daab4bc70e5a743972561d28effea9429a Mon Sep 17 00:00:00 2001 From: Erich Eckner Date: Fri, 4 May 2018 11:20:29 +0200 Subject: lib/common-functions: mangle_pkgbuild: remove lib32- from *depends --- lib/common-functions | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/lib/common-functions b/lib/common-functions index 2cf4e22..4e9570a 100755 --- a/lib/common-functions +++ b/lib/common-functions @@ -549,6 +549,7 @@ recursively_umount_and_rm() { # mangle_pkgbuild $PKGBUILD [$sub_pkgrel] # mangle $arch in PKBUILDs to contain i486, i586, i686 # append $sub_pkgrel to the pkgrel +# remove "lib32-" from {make,check,opt,}depends # TODO: actually include the other architectures @@ -572,6 +573,16 @@ mangle_pkgbuild() { } s/^\(\s*pkgrel=\)['"'"'"]\?\([0-9.]\+\)['"'"'"]\?\s*\(#.*\)\?$/\1"\2'"${sub_pkgrel}"'"/ ' "${PKGBUILD}" + + sed -i ' + /^\s*\(\(make\|check\|opt\|\)depends\)=(/ { + :a + s,^\s*\(\S[^=]*\)=(\([^()]*\(#[^\n]*\n\)\?\)*),\0\n\1=(${\1[\@]/lib32-/})\n, + t + $!N + ba + } + ' "${PKGBUILD}" } # find_package_repository_to_package $package $git_repository $git_commit -- cgit v1.2.3-70-g09d2