Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-05-04 11:20:29 +0200
committerErich Eckner <git@eckner.net>2018-05-04 11:20:29 +0200
commit3c7219daab4bc70e5a743972561d28effea9429a (patch)
tree25c22645240664a1e9ba0bd1200f002bf1bb4315 /lib
parent0b8656d1089ff62c3e1582fe9c4db92b5e7ef7cf (diff)
lib/common-functions: mangle_pkgbuild: remove lib32- from *depends
Diffstat (limited to 'lib')
-rwxr-xr-xlib/common-functions11
1 files changed, 11 insertions, 0 deletions
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