[oe-commits] Laurentiu Palcu : eglibc: fix ldd RTLDLIST
git at git.openembedded.org
git at git.openembedded.org
Sat Mar 2 12:56:50 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: f2804dc9a9ba666de85b4efb1fd005fa985f4f8a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=f2804dc9a9ba666de85b4efb1fd005fa985f4f8a
Author: Laurentiu Palcu <laurentiu.palcu at intel.com>
Date: Thu Feb 28 13:56:26 2013 +0200
eglibc: fix ldd RTLDLIST
The sed expression for retrieving the previous RTLDLIST from ldd script
was also retrieving the double-quotes. Hence, we ended up with a
RTLDLIST like below and ldd would fail:
RTLDLIST=""/lib/ld-linux.so.2 /lib64/ld-linux-x86-64.so.2
/libx32/ld-linux-x32.so.2" /lib/ld-linux-x86-64.so.2"
[YOCTO #3903]
Signed-off-by: Laurentiu Palcu <laurentiu.palcu at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
---
meta/recipes-core/eglibc/eglibc_2.17.bb | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/meta/recipes-core/eglibc/eglibc_2.17.bb b/meta/recipes-core/eglibc/eglibc_2.17.bb
index fb49ac4..6526978 100644
--- a/meta/recipes-core/eglibc/eglibc_2.17.bb
+++ b/meta/recipes-core/eglibc/eglibc_2.17.bb
@@ -144,7 +144,7 @@ do_compile () {
echo "Adjust ldd script"
if [ -n "${RTLDLIST}" ]
then
- prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST=\(.*\)$#\1#'`
+ prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST="\?\([^"]*\)"\?$#\1#'`
if [ "${prevrtld}" != "${RTLDLIST}" ]
then
sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${prevrtld} ${RTLDLIST}\"#"
More information about the Openembedded-commits
mailing list