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 a81419a6761e70159795ba6c2107d9c5f0a45088..702aa05f8f62fd346c67d012afc77168dec28138 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,7 +24,11 @@
 
 include Config
 
-VER        = 2.3.6
+ifeq "$(MACHINE_TYPE)" "arm"
+       VER = 2.5
+else
+       VER = 2.3.6
+endif
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -51,7 +55,15 @@ else
   EXTRA_INSTALL =
 endif
 
-EXTRA_CONFIG += --build=$(BUILDTARGET)
+ifeq "$(MACHINE_TYPE)" "arm"
+       # Disable hardware FP for ARM.
+       EXTRA_CONFIG += \
+               --build=arm \
+               --host=$(BUILDTARGET) \
+               --without-fp
+else
+       EXTRA_CONFIG += --build=$(BUILDTARGET)
+endif
 
 ###############################################################################
 # Top-level Rules
@@ -63,8 +75,20 @@ objects = $(DL_FILE) \
 $(DL_FILE) = $(DL_FROM)/$(DL_FILE)
 glibc-libidn-$(VER).tar.bz2 = $(DL_FROM)/glibc-libidn-$(VER).tar.bz2
 
-$(DL_FILE)_MD5 = bfdce99f82d6dbcb64b7f11c05d6bc96
-glibc-libidn-$(VER).tar.bz2_MD5 = 49dbe06ce830fc73874d6b38bdc5b4db
+ifeq "$(MACHINE_TYPE)" "arm"
+       $(DL_FILE)_MD5 = 1fb29764a6a650a4d5b409dda227ac9f
+       glibc-libidn-$(VER).tar.bz2_MD5 = 8787868ba8962d9b125997ec2f25ac01
+else
+       $(DL_FILE)_MD5 = bfdce99f82d6dbcb64b7f11c05d6bc96
+       glibc-libidn-$(VER).tar.bz2_MD5 = 49dbe06ce830fc73874d6b38bdc5b4db
+endif
+
+# 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
+endif
 
 install : $(TARGET)
 
@@ -95,23 +119,42 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
        @$(PREBUILD)
        @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
+else
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-dont_use_origin_on_privil_exec.patch
+endif
 
 ifeq "$(ROOT)" ""
+ifeq "$(MACHINE)" "i586"
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-linux_types-1.patch
        cd $(DIR_APP) && patch -Np1 -i $(DIR_SRC)/src/patches/$(THISAPP)-inotify-1.patch
+endif
        # This locale causes a loop on bash login - exclude it
        cd $(DIR_APP) && sed -i '/vi_VN.TCVN/d' localedata/SUPPORTED
+ifeq "$(MACHINE_TYPE)" "arm"
+       cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.3 -o|' \
+               scripts/test-installation.pl
+else
        cd $(DIR_APP) && sed -i 's|libs -o|libs -L/usr/lib -Wl,-dynamic-linker=/lib/ld-linux.so.2 -o|' \
                scripts/test-installation.pl
 endif
-       cd $(DIR_SRC)/glibc-build && $(DIR_APP)/configure $(EXTRA_CONFIG)
+endif
+       cd $(DIR_SRC)/glibc-build && CFLAGS="$(CFLAGS)" $(DIR_APP)/configure $(EXTRA_CONFIG)
 
 ifeq "$(ROOT)" ""
        touch /etc/ld.so.conf
        cd $(DIR_SRC)/glibc-build && make $(MAKETUNING) $(EXTRA_MAKE)
        cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
+ifeq "$(MACHINE)" "i586"
        cp -v $(DIR_APP)/sysdeps/unix/sysv/linux/inotify.h /usr/include/sys
+endif
 else
        -mkdir /tools/etc
        touch /tools/etc/ld.so.conf
@@ -124,7 +167,8 @@ ifeq "$(ROOT)" ""
        mkdir -p /usr/lib/locale
        cd $(DIR_SRC)/glibc-build && localedef -i en_US -f ISO-8859-1 en_US
        cd $(DIR_SRC)/glibc-build && localedef -i en_US -f UTF-8      en_US.utf8
-       cp -f /usr/share/zoneinfo/GMT /etc/localtime
+       # XXX zoneinfo stuff is not installed
+       #cp -f /usr/share/zoneinfo/GMT /etc/localtime
 endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build
        @$(POSTBUILD)