diff options
author | Laurentiu Palcu <laurentiu.palcu@intel.com> | 2013-02-28 13:56:26 +0200 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-03-02 12:56:53 +0000 |
commit | 99ff74adceb309b38cf73d064d8bba91da50a8df (patch) | |
tree | abfbcf40e6e1074258f955c911d8231a259c81b6 | |
parent | f090c1523f6fd600dde01e53250f9b1ea79219c6 (diff) | |
download | poky-99ff74adceb309b38cf73d064d8bba91da50a8df.tar.gz |
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 <laurentiu.palcu@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | 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 fb49ac4535..6526978469 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 () { | |||
144 | echo "Adjust ldd script" | 144 | echo "Adjust ldd script" |
145 | if [ -n "${RTLDLIST}" ] | 145 | if [ -n "${RTLDLIST}" ] |
146 | then | 146 | then |
147 | prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST=\(.*\)$#\1#'` | 147 | prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST="\?\([^"]*\)"\?$#\1#'` |
148 | if [ "${prevrtld}" != "${RTLDLIST}" ] | 148 | if [ "${prevrtld}" != "${RTLDLIST}" ] |
149 | then | 149 | then |
150 | sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${prevrtld} ${RTLDLIST}\"#" | 150 | sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${prevrtld} ${RTLDLIST}\"#" |