summaryrefslogtreecommitdiff
path: root/glibc
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2004-09-01 10:19:19 +0000
committerPhil Blundell <philb@gnu.org>2004-09-01 10:19:19 +0000
commitdeaa7edd56bd77d15e39fc6ebba6f0c12f8dc5c7 (patch)
tree2b5a7e5fd022f011fa3d97beb6ab7dade885c0fe /glibc
parentca537b98682f05db8112845e764b1427877a7b95 (diff)
Merge bk://openembedded@openembedded.bkbits.net/packages
into stealth.(none):/home/pb/oe/oe-packages 2004/09/01 11:12:57+01:00 (none)!pb add missing space BKrev: 4135a227lRwhS_hACgdDnE8bhFGO5A
Diffstat (limited to 'glibc')
-rw-r--r--glibc/glibc_2.3.2+cvs20040726.oe4
-rw-r--r--glibc/glibc_cvs.oe4
2 files changed, 6 insertions, 2 deletions
diff --git a/glibc/glibc_2.3.2+cvs20040726.oe b/glibc/glibc_2.3.2+cvs20040726.oe
index ee52d839c0..e9570ce7fe 100644
--- a/glibc/glibc_2.3.2+cvs20040726.oe
+++ b/glibc/glibc_2.3.2+cvs20040726.oe
@@ -60,11 +60,13 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc;date=${@oe.dat
file://arm-memcpy.patch;patch=1;pnum=0 \
file://arm-longlong.patch;patch=1;pnum=0 \
file://arm-machine-gmon.patch;patch=1;pnum=0 \
- file://dyn-ldconfig.patch;patch=1;pnum=0 \
\
file://etc/ld.so.conf \
file://generate-supported.mk"
+# seems to fail on tls platforms
+SRC_URI_append_arm = " file://dyn-ldconfig.patch;patch=1;pnum=0"
+
S = "${WORKDIR}/libc"
B = "${WORKDIR}/build-${TARGET_SYS}"
diff --git a/glibc/glibc_cvs.oe b/glibc/glibc_cvs.oe
index aa9fe24306..24e1c1a5c3 100644
--- a/glibc/glibc_cvs.oe
+++ b/glibc/glibc_cvs.oe
@@ -64,11 +64,13 @@ SRC_URI = "cvs://anoncvs@sources.redhat.com/cvs/glibc;module=libc \
file://arm-memcpy.patch;patch=1;pnum=0 \
file://arm-longlong.patch;patch=1;pnum=0 \
file://arm-machine-gmon.patch;patch=1;pnum=0 \
- file://dyn-ldconfig.patch;patch=1;pnum=0 \
\
file://etc/ld.so.conf \
file://generate-supported.mk"
+# seems to break on TLS platforms
+SRC_URI_append_arm = " file://dyn-ldconfig.patch;patch=1;pnum=0"
+
S = "${WORKDIR}/libc"
B = "${WORKDIR}/build-${TARGET_SYS}"