Browse Source

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

user/amery/janus
Christian Wiese 13 years ago
committed by Alejandro Mery
parent
commit
44155167ab
1 changed files with 5 additions and 6 deletions
  1. +5
    -6
      base/glibc/glibc.conf

+ 5
- 6
base/glibc/glibc.conf

@ -119,6 +119,11 @@ var_append extraconfopt " " "--enable-kernel=2.6.32"
pkg_glibc_preconf() {
configprefix='CFLAGS="$CFLAGS -g -DNDEBUG=1 -O2"'
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,9 +326,3 @@ if atstage toolchain; then
makeopt=
makeinstopt="-k cross-compiling=yes install-headers"
fi
# workaround for failing builds when building for i686 cpu family
case $arch_machine in
i686) var_append extraconfopt ' ' "--disable-multi-arch" ;;
esac

Loading…
Cancel
Save