glibc: fixed multilib build by moving i686 workaround into preconf hook

13 years ago · e5c9958142
1 changed files with 5 additions and 5 deletions
--- a/base/glibc/glibc.conf
+++ b/base/glibc/glibc.conf
@ -118,6 +118,11 @@ var_append confopt " " "--enable-kernel=2.6.18"
 pkg_glibc_preconf(){
 	configprefix='CFLAGS="$CFLAGS -g -DNDEBUG=1"'
 	configscript="../configure"
+
+	# workaround for failing builds when building for i686 cpu family
+	case $arch_machine in
+		i686) var_append extraconfopt ' ' "--disable-multi-arch" ;;
+	esac
 }
 hook_add preconf 3 "pkg_glibc_preconf"

@ -321,8 +326,3 @@ fi

 hook_add prepatch 3 "glibc_prepatch"

-# workaround for failing builds when building for i686 cpu family
-case $arch_machine in
-	i686) var_append extraconfopt ' ' "--disable-multi-arch" ;;
-esac
-