Merge branch 'kernel-update' of ssh://git.ipfire.org/pub/git/ipfire-2.x into glibc...

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

diff --git a/lfs/glibc b/lfs/glibc
index 97b1cfe2205646598417e9dbe56c597a96d506e9..22a1e6133874ce2908152fe8493fbd99518f86a5 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,8 @@
 
 include Config
 
-VER = 2.5
+VER        = 2.12.2
+PORTS_VER  = 2.12.1
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -35,48 +36,57 @@ DIR_APP    = $(DIR_SRC)/$(THISAPP)
 #
 ifeq "$(ROOT)" ""
   TARGET = $(DIR_INFO)/$(THISAPP)
-  EXTRA_CONFIG = --prefix=/usr \
-    --disable-profile --enable-add-ons \
-    --enable-kernel=2.6.0 --libexecdir=/usr/lib/glibc
+  EXTRA_CONFIG = \
+       --prefix=/usr \
+       --libexecdir=/usr/lib/glibc
   EXTRA_MAKE =
   EXTRA_INSTALL =
 else
   TARGET = $(DIR_INFO)/$(THISAPP)-tools
-  EXTRA_CONFIG = --prefix=/tools \
-    --disable-profile --enable-add-ons \
-    --enable-kernel=2.6.0 --with-binutils=/tools/bin \
-    --without-gd --with-headers=/tools/include \
-    --without-selinux
+  EXTRA_CONFIG = \
+       --prefix=/tools \
+       --with-binutils=/tools/bin \
+       --with-headers=/tools/include \
+       --without-gd
   EXTRA_MAKE =
   EXTRA_INSTALL =
 endif
 
 EXTRA_CONFIG += --build=$(BUILDTARGET)
 
+# Enable some extra optimization for the glibc code.
+export CFLAGS := $(subst -O2,-O3,$(CFLAGS))
+
 ifeq "$(MACHINE_TYPE)" "arm"
        # Disable hardware FP for ARM.
        EXTRA_CONFIG += \
                --without-fp
 endif
 
+# Add some general configuration flags
+EXTRA_CONFIG += \
+       --disable-profile \
+       --enable-kernel=2.6.16 \
+       --enable-add-ons \
+       --without-selinux \
+       --enable-experimental-malloc \
+       --enable-bind-now
+
 ###############################################################################
 # Top-level Rules
 ###############################################################################
 
-objects = $(DL_FILE) \
-       glibc-libidn-$(VER).tar.bz2
+objects = $(DL_FILE)
 
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
-glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
 
-$(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
-glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
+$(DL_FILE)_MD5 = 903fcfa547df2f453476800e0838fe52
 
 # ARM needs glibc-ports
 ifeq "$(MACHINE_TYPE)" "arm"
-       objects += glibc-ports-$(VER).tar.bz2
-       glibc-ports-$(VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(VER).tar.bz2
-       glibc-ports-$(VER).tar.bz2_MD5 = 183f6d46e8fa5e4b2aff240ab1586c2e
+       objects += glibc-ports-$(PORTS_VER).tar.bz2
+       glibc-ports-$(PORTS_VER).tar.bz2 = $(DL_FROM)/glibc-ports-$(PORTS_VER).tar.bz2
+       glibc-ports-$(PORTS_VER).tar.bz2_MD5 = cb01ab976180e98287cef5079e35359e
 endif
 
 install : $(TARGET)
@@ -109,13 +119,8 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE)
        @mkdir $(DIR_SRC)/glibc-build
 ifeq "$(MACHINE_TYPE)" "arm"
-       cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(VER).tar.bz2
-       cd $(DIR_APP) && mv -v glibc-ports-$(VER) ports
-
-       cd $(DIR_APP)/ports && patch -Np1 -i $(DIR_SRC)/src/patches/glibc-ports-avoid-using-asm-procinfo.patch
-
-       # asm/page.h should not be included in sysdeps/unix/sysv/linux/arm/ioperm.c.
-       cd $(DIR_APP) && sed "/asm\/page.h/d" -i ports/sysdeps/unix/sysv/linux/arm/ioperm.c
+       cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(PORTS_VER).tar.bz2
+       cd $(DIR_APP) && mv -v glibc-ports-$(PORTS_VER) ports
 endif
 
 ifeq "$(ROOT)" ""