From patchwork Wed Jan 30 16:26:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: eglibc: don't list the same path twice in RTLDLIST Date: Wed, 30 Jan 2013 16:26:40 -0000 From: Bogdan Marinescu X-Patchwork-Id: 43721 Message-Id: <1359563200-28139-1-git-send-email-bogdan.a.marinescu@intel.com> To: openembedded-core@lists.openembedded.org Before modifying RTLDLIST in ldd, make sure that it doesn't already contain the right path, thus avoiding duplicate entries in RTLDLIST. [YOCTO #2655] Signed-off-by: Bogdan Marinescu --- 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 }