Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-09-13 16:31:26 +0200
committerErich Eckner <git@eckner.net>2018-09-13 16:31:26 +0200
commit439223c5b2d71a5221abbcb7a20ad1fc27663173 (patch)
tree12dfa3b0b49909d8fd60efc6791895b36b7dcdd7
parent1043bc79df83ae761ec29f1bb7d6838150963daf (diff)
parent3960db8cbbf8b09ebae641841efeb15498384de6 (diff)
Merge branch 'master' into i486
-rw-r--r--core/glibc/PKGBUILD16
1 files changed, 6 insertions, 10 deletions
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 83751716..8d191e6e 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -12,6 +12,7 @@ eval "$(
s/.*/}/
q
}
+ s@--enable-multi-arch@--disable-multi-arch@
'
declare -f package_glibc | \
sed '
@@ -23,17 +24,12 @@ eval "$(
)"
# 486-specific
-if [ "${CARCH}" = "i486" ]; then
- # no gd for memory profiles
- makedepends=(${makedepends[@]//gd/})
- # disable multilib, we are on 32-bit only
- eval "$(
- declare -f build | \
- sed '
- s@--enable-multi-arch@--disable-multi-arch@
- '
- )"
+# no gd for memory profiles
+makedepends=(${makedepends[@]//gd/})
+makedepends_i686=('gd'})
+
+if [ "${CARCH}" = "i486" ]; then
# disable testing for now, we run out of memory
eval "$(