[oe-commits] Bogdan Marinescu : eglibc: don't list the same path twice in RTLDLIST

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master
Commit: 3cef117439aea2d724e92dcb0f862f1cc8e8bfa5
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=3cef117439aea2d724e92dcb0f862f1cc8e8bfa5

Author: Bogdan Marinescu <bogdan.a.marinescu at intel.com>
Date:   Wed Jan 30 18:26:40 2013 +0200

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]

Signed-off-by: Bogdan Marinescu <bogdan.a.marinescu at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>

---

 meta/recipes-core/eglibc/eglibc_2.17.bb |    9 ++++++---
 1 files 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
 
 }