Forward Firewall: reorganised ruletable layout

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

diff --git a/lfs/glibc b/lfs/glibc
index 70ae0df94c11466e5d1c8c933c09723a41a86172..ccbdb315881754bec78b90d4a58eae65b03c2bd0 100644 (file)
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -57,14 +57,13 @@ else
 endif
 
 # Enable some extra optimization for the glibc code.
-export CFLAGS := -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC \
+CFLAGS = -O3 -DNDEBUG -fasynchronous-unwind-tables -fPIC -DPIC \
        -DNO_CTORS_DTORS_SECTIONS
 
 ifeq "$(MACHINE)" "i586"
        CFLAGS += -march=i586 -mtune=generic -mno-tls-direct-seg-refs
 endif
 
-
 ifeq "$(MACHINE_TYPE)" "arm"
        # Disable hardware FP for ARM.
        EXTRA_CONFIG += \
@@ -238,14 +237,13 @@ endif
 
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-nss_test1.patch
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-test-installation.pl-libgcc_s.patch
 
        # Fixes:
        #   Makefile:235: *** mixed implicit and normal rules.  Stop.
        cd $(DIR_APP) && sed -i 's/ot \$$/ot:\n\ttouch $$@\n$$/' manual/Makefile
 
-       # Fix an issue when building glibc with gcc 4.7.
-       #cd $(DIR_APP) && sed -i "s/ -lgcc_s//" Makeconfig
-
 ifeq "$(ROOT)" ""
 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|' \
@@ -260,7 +258,7 @@ endif
                CFLAGS="$(CFLAGS) -fno-asynchronous-unwind-tables" \
                $(DIR_APP)/configure $(EXTRA_CONFIG)
        cd $(DIR_SRC)/glibc-build && make PARALLELMFLAGS=$(MAKETUNING) \
-               CFLAFS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
+               CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)"
        cd $(DIR_SRC)/glibc-build && make $(EXTRA_INSTALL) install
 
 ifeq "$(ROOT)" ""
@@ -268,6 +266,9 @@ 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
+
+       # Timezone data will be shipped by tzdata.
+       rm -rfv /usr/share/zoneinfo
 endif
        @rm -rf $(DIR_APP) $(DIR_SRC)/glibc-build
        @$(POSTBUILD)