summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Sokolovsky <pmiscml@gmail.com>2006-09-28 11:07:44 +0000
committerPaul Sokolovsky <pmiscml@gmail.com>2006-09-28 11:07:44 +0000
commit84afd9f2e39e2791be8ce7bdf95b6187b3d7adb9 (patch)
tree8051ce82699d096acd6d4f4cbcf8df5ac813f989
parent6977e997471f6e448ba2e6d4f7f38ab0cf51967d (diff)
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>.
-rw-r--r--packages/glibc/glibc_2.4.bb6
1 files changed, 4 insertions, 2 deletions
diff --git a/packages/glibc/glibc_2.4.bb b/packages/glibc/glibc_2.4.bb
index cbbe8e8dec..de010e3717 100644
--- 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"