From af3d129c64c92408a69874e76a04f286c33b4e01 Mon Sep 17 00:00:00 2001 From: Laurentiu Palcu Date: Thu, 28 Feb 2013 13:56:26 +0200 Subject: [PATCH] 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] (From OE-Core rev: f2804dc9a9ba666de85b4efb1fd005fa985f4f8a) Signed-off-by: Laurentiu Palcu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc_2.17.bb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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}\"#" -- 2.7.4