From: Michael Lauer <mickey@vanille-media.de>
Date: Fri, 29 Sep 2006 10:19:15 +0000 (+0000)
Subject: merge of c03b28dceb994cd2ab73b1d2bee782c3a0360eac
X-Git-Tag: Release-2010-05/1~9453^2~669
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=289a6021a27890a78e80bd8927d2654bbf7bc9be;p=openembedded.git

merge of c03b28dceb994cd2ab73b1d2bee782c3a0360eac
     and de4a9ac2f220bdc6c4e7d015feb7d54b59f4cf40
---

289a6021a27890a78e80bd8927d2654bbf7bc9be
diff --cc packages/glibc/glibc_2.4.bb
index a3012d6cce,4483edb0aa..45131eafad
--- a/packages/glibc/glibc_2.4.bb
+++ b/packages/glibc/glibc_2.4.bb
@@@ -66,6 -65,10 +66,7 @@@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/gl
             file://etc/ld.so.conf \
             file://generate-supported.mk"
  
 -# Build fails on 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"