eglibc: fix ldd RTLDLIST

Submitted by Laurentiu Palcu on Feb. 28, 2013, 11:56 a.m. | Patch ID: 45277

Details

Message ID 1362052586-27170-1-git-send-email-laurentiu.palcu@intel.com
State Accepted
Commit 99ff74adceb309b38cf73d064d8bba91da50a8df
Headers show

Commit Message

Laurentiu Palcu Feb. 28, 2013, 11:56 a.m. 
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@intel.com>
---
 meta/recipes-core/eglibc/eglibc_2.17.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch hide | download patch | download mbox 

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}\"#"