Install cpuid.h to toolchain.

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

diff --git a/lfs/glibc b/lfs/glibc
index 11952a605e0b8580d64ab5c17f6bb33b4a68d6bb..0ce510c9f82bd2fbaf3fceb25e8eb1144d99aedf 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -24,11 +24,8 @@
 
 include Config
 
-ifeq "$(MACHINE_TYPE)" "arm"
-       VER = 2.5
-else
-       VER = 2.3.6
-endif
+VER        = 2.12.2
+PORTS_VER  = 2.12.1
 
 THISAPP    = glibc-$(VER)
 DL_FILE    = $(THISAPP).tar.bz2
@@ -67,25 +64,17 @@ endif
 # 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
 
-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
+$(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)
@@ -125,15 +114,9 @@ ifeq "$(MACHINE_TYPE)" "arm"
 
        # 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"
@@ -150,9 +133,6 @@ 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
@@ -165,9 +145,6 @@ 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
-ifneq "$(MACHINE_TYPE)" "arm"
-       cp -f /usr/share/zoneinfo/GMT /etc/localtime
-endif
 endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build
        @$(POSTBUILD)