Merge remote branch 'origin/next' into arm-port

[people/teissler/ipfire-2.x.git] / lfs / glibc

diff --git a/lfs/glibc b/lfs/glibc
index be3738206ec5c790534a7b4085c04a0604047617..702aa05f8f62fd346c67d012afc77168dec28138 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -40,14 +40,14 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
   EXTRA_CONFIG = --prefix=/usr \
-    --disable-profile \
+    --disable-profile --enable-add-ons \
     --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
   EXTRA_CONFIG = --prefix=/tools \
-    --disable-profile \
+    --disable-profile --enable-add-ons \
     --enable-kernel=2.6.0 --with-binutils=/tools/bin \
     --without-gd --with-headers=/tools/include \
     --without-selinux
@@ -60,10 +60,9 @@ ifeq "$(MACHINE_TYPE)" "arm"
        EXTRA_CONFIG += \
                --build=arm \
                --host=$(BUILDTARGET) \
-               --without-fp \
-               --enable-add-ons=nptl,ports
+               --without-fp
 else
-       EXTRA_CONFIG += --enable-add-ons
+       EXTRA_CONFIG += --build=$(BUILDTARGET)
 endif
 
 ###############################################################################