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>2019-11-28 08:33:20 +0100
committerErich Eckner <git@eckner.net>2019-11-28 08:36:39 +0100
commit816ee0c04adc99cfba6f3fd7d2ef380a7caafe4d (patch)
tree8249be4776f4c0e749374ff15737b608da1ee379 /lib
parenta23507bf206c2dcfcb0f65bc26ab24d2e0bb2999 (diff)
lib/common-functions: mangle_pkgbuild(): remove $pkgrel from {make,check,opt,}depends
Diffstat (limited to 'lib')
-rwxr-xr-xlib/common-functions2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/common-functions b/lib/common-functions
index f9717eb..48ba931 100755
--- a/lib/common-functions
+++ b/lib/common-functions
@@ -429,6 +429,7 @@ recursively_umount_and_rm() {
# mangle $arch in PKBUILDs to contain i486, i686, pentium4
# append $sub_pkgrel to the pkgrel
# remove "lib32-" and "gcc-multilib" from {make,check,opt,}depends
+# remove $pkgrel from {make,check,opt,}depends
mangle_pkgbuild() {
local PKGBUILD="$1"
@@ -462,6 +463,7 @@ mangle_pkgbuild() {
}
s/\(["'"'"'([:space:]]\)lib32-/\1/g
s/\(["'"'"'([:space:]]\)gcc-multilib\(["'"'"')[:space:]]\)/\1gcc\2/g
+ s/\(["'"'"'([:space:]]\S\+[<=>]\S\+\)-[^:"'"'"')[:space:]]\+\([:"'"'"')[:space:]]\)/\1\2/g
}
' "${PKGBUILD}"
}