summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-03-31 05:00:12 +0000
committerOpenEmbedded Project <openembedded-devel@lists.openembedded.org>2007-03-31 05:00:12 +0000
commit1eeee6b6536402482d753e87ba1d44ce84eaf359 (patch)
tree3abfbfc5bd828357836ef170af313b26feac8026
parent7b297dc027dab0a74b755934e00a697abaf9b6ad (diff)
parentc0dbcb125c5be97862e0977a7671fc699e0758aa (diff)
merge of '1d9f268bc89239825562b058da39c3adca103c95'
and '3ab40bd75c45a4d18edae9d2a5215c0bbf6882b9'
-rw-r--r--packages/glibc/glibc-2.4/ldd-unbash.patch11
-rw-r--r--packages/glibc/glibc_2.5.bb1
2 files changed, 12 insertions, 0 deletions
diff --git a/packages/glibc/glibc-2.4/ldd-unbash.patch b/packages/glibc/glibc-2.4/ldd-unbash.patch
new file mode 100644
index 0000000000..2fb8854b49
--- /dev/null
+++ b/packages/glibc/glibc-2.4/ldd-unbash.patch
@@ -0,0 +1,11 @@
+--- glibc-2.5/elf/ldd.bash.in.org 2006-04-30 16:06:20.000000000 +0000
++++ glibc-2.5/elf/ldd.bash.in 2007-03-30 19:18:57.000000000 +0000
+@@ -110,7 +110,7 @@
+ # environments where the executed program might not have permissions
+ # to write to the console/tty. But only bash 3.x supports the pipefail
+ # option, and we don't bother to handle the case for older bash versions.
+-if set -o pipefail 2> /dev/null; then
++if false; then
+ try_trace() {
+ eval $add_env '"$@"' | cat
+ }
diff --git a/packages/glibc/glibc_2.5.bb b/packages/glibc/glibc_2.5.bb
index ee137541bb..8cd4c2ecd1 100644
--- a/packages/glibc/glibc_2.5.bb
+++ b/packages/glibc/glibc_2.5.bb
@@ -56,6 +56,7 @@ SRC_URI = "ftp://ftp.gnu.org/pub/gnu/glibc/glibc-${PV}.tar.bz2 \
# file://glibc-2.4-openat-3.patch;patch=1 \
# file://fixup-aeabi-syscalls.patch;patch=1 \
file://zecke-sane-readelf.patch;patch=1 \
+ file://ldd-unbash.patch;patch=1 \
file://generic-bits_select.h \
file://generic-bits_types.h \
file://generic-bits_typesizes.h \