Merge branch 'master' into i486

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 "$(