From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 15 Aug 2012 13:51:20 +0000 (+0200)
Subject: glibc: Fix order of patches.
X-Git-Tag: v2.13-beta1~252^2~3
X-Git-Url: http://git.ipfire.org/?p=ipfire-2.x.git;a=commitdiff_plain;h=13b8798d78f38ddca030c69d5f21de7a9b18bddb

glibc: Fix order of patches.

One patch only applied to the ports addon, which
is not available on i586.
---

diff --git a/lfs/glibc b/lfs/glibc
index d3590d80f3..70ae0df94c 100644
--- a/lfs/glibc
+++ b/lfs/glibc
@@ -130,6 +130,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 +237,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: