glibc 2.4: Apply recently added patches only fo x86.

* Fixes breakage on ARM.
* Don't bump PR (previous commit neither did), to save long rebuilds.
Few people affected should use "bitbake glibc -c rebuild".
* Fixes #1443.
* Approved by Michael 'Mickey' Lauer <mickey at tm.informatik.uni-frankfurt de>.

diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index cbbe8e8..de010e3 100644 (file)
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@ -58,8 +58,6 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2 \
           file://glibc-2.4-compile.patch;patch=1 \
           file://fixup-aeabi-syscalls.patch;patch=1 \
           file://zecke-sane-readelf.patch;patch=1 \
-          file://openat-bugzilla-fix-1220.patch;patch=1 \
-          file://fix-fchownat-20060808.patch;patch=1 \
           file://generic-bits_select.h \
           file://generic-bits_types.h \
           file://generic-bits_typesizes.h \
@@ -67,6 +65,10 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-2.4.tar.bz2 \
            file://etc/ld.so.conf \
            file://generate-supported.mk"
 
+# Build fails of x86 without additional patches, but these break arm
+SRC_URI_append_x86 = " file://openat-bugzilla-fix-1220.patch;patch=1 \
+           file://fix-fchownat-20060808.patch;patch=1"
+
 # Build fails on sh3 and sh4 without additional patches
 SRC_URI_append_sh3 = " file://no-z-defs.patch;patch=1"
 SRC_URI_append_sh4 = " file://no-z-defs.patch;patch=1"