Merge branch 'glibc-update2' of ssh://git.ipfire.org/pub/git/people/ms/ipfire-2.x...

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

diff --git a/lfs/glibc b/lfs/glibc
index d3590d80f3e4d807bf6a8b3d6ed1edd5854b4fa3..f2553e98af27160280d0f9798d6f2d0461de87d8 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 += \
@@ -130,6 +129,9 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
 ifeq "$(MACHINE_TYPE)" "arm"
        cd $(DIR_APP) && tar jxf $(DIR_DL)/glibc-ports-$(PORTS_VER).tar.bz2
        cd $(DIR_APP) && mv -v glibc-ports-$(PORTS_VER) ports
+
+       # http://sourceware.org/bugzilla/show_bug.cgi?id=12354
+       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-cfi-entry-not-closed.patch
 endif
 
        # Apply all patches.
@@ -234,8 +236,6 @@ endif
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc/glibc-rh837026.patch
 
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-resolv-stack_chk_fail.patch
-       # http://sourceware.org/bugzilla/show_bug.cgi?id=12354
-       cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-cfi-entry-not-closed.patch
        cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/glibc-remove-ctors-dtors-output-sections.patch
 
        # Fixes:
@@ -259,7 +259,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)" ""