[Buildroot] [RFC PATCH 8/9] support/scripts: check-host-rpath now handles $ORIGIN as well
Wolfgang Grandegger
wg at grandegger.com
Fri Mar 3 14:18:52 UTC 2017
$ORIGIN/../../usr/bin is also a valid rpath for binaries in
"$hostdir/usr/bin".
Signed-off-by: Wolfgang Grandegger <wg at grandegger.com>
---
support/scripts/check-host-rpath | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/support/scripts/check-host-rpath b/support/scripts/check-host-rpath
index 6ce547c..020c123 100755
--- a/support/scripts/check-host-rpath
+++ b/support/scripts/check-host-rpath
@@ -58,7 +58,7 @@ check_elf_has_rpath() {
for dir in ${rpath//:/ }; do
# Remove duplicate and trailing '/' for proper match
dir="$( sed -r -e 's:/+:/:g; s:/$::;' <<<"${dir}" )"
- [ "${dir}" = "${hostdir}/usr/lib" ] && return 0
+ [ "${dir}" = "${hostdir}/usr/lib" -o "${dir}" = "\$ORIGIN/../../usr/lib" ] && return 0
done
done < <( readelf -d "${file}" \
|sed -r -e '/.* \(R(UN)?PATH\) +Library r(un)?path: \[(.+)\]$/!d' \
--
1.9.1
More information about the buildroot
mailing list