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 <bogdan.a.marinescu@intel.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
parent
703b70c98a
commit
947e95b67c
|
@ -1,6 +1,6 @@
|
||||||
require eglibc.inc
|
require eglibc.inc
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
DEPENDS += "gperf-native kconfig-frontends-native"
|
DEPENDS += "gperf-native kconfig-frontends-native"
|
||||||
|
|
||||||
|
@ -143,8 +143,11 @@ do_compile () {
|
||||||
echo "Adjust ldd script"
|
echo "Adjust ldd script"
|
||||||
if [ -n "${RTLDLIST}" ]
|
if [ -n "${RTLDLIST}" ]
|
||||||
then
|
then
|
||||||
sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)"\(.*\)"$#\1\2#'
|
prevrtld=`cat ${B}/elf/ldd | grep "^RTLDLIST=" | sed 's#^RTLDLIST=\(.*\)$#\1#'`
|
||||||
sed -i ${B}/elf/ldd -e 's#^\(RTLDLIST=\)\(.*\)$#\1"${RTLDLIST} \2"#'
|
if [ "${prevrtld}" != "${RTLDLIST}" ]
|
||||||
|
then
|
||||||
|
sed -i ${B}/elf/ldd -e "s#^RTLDLIST=.*\$#RTLDLIST=\"${prevrtld} ${RTLDLIST}\"#"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue