From c84eb39db0736de76edd4a39532c9de4b8480f7c Mon Sep 17 00:00:00 2001 From: Bogdan Marinescu Date: Wed, 30 Jan 2013 18:26:40 +0200 Subject: [PATCH] eglibc: don't list the same path twice in RTLDLIST Before modifying RTLDLIST in ldd, make sure that it doesn't already contain the right path, thus avoiding duplicate entries in RTLDLIST. [YOCTO #2655] (From OE-Core rev: 3cef117439aea2d724e92dcb0f862f1cc8e8bfa5) Signed-off-by: Bogdan Marinescu Signed-off-by: Saul Wold Signed-off-by: Richard Purdie --- meta/recipes-core/eglibc/eglibc_2.17.bb | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/meta/recipes-core/eglibc/eglibc_2.17.bb b/meta/recipes-core/eglibc/eglibc_2.17.bb index c1cae4f..7bdb267 100644 --- a/meta/recipes-core/eglibc/eglibc_2.17.bb +++ b/meta/recipes-core/eglibc/eglibc_2.17.bb @@ -1,6 +1,6 @@ require eglibc.inc -PR = "r1" +PR = "r2" DEPENDS += "gperf-native kconfig-frontends-native" @@ -143,8 +143,11 @@ do_compile () { echo "Adjust ldd script" if [ -n "${RTLDLIST}" ] then - sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#' - sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#' + 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}\"#" + fi fi } -- 2.7.4