From 04de67e6b7b778388e9e7bebcbb22c0ced20b818 Mon Sep 17 00:00:00 2001 From: Atsushi Watanabe Date: Fri, 31 May 2024 10:41:17 +0900 Subject: [PATCH] Update RPATH fix script for latest chrpath (#169) Latest chrpath outputs RUNPATH=/path instead of RPATH=/path --- generate_rospkg_apkbuild/APKBUILD.em.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/generate_rospkg_apkbuild/APKBUILD.em.sh b/generate_rospkg_apkbuild/APKBUILD.em.sh index c57bbe1..c7f2a15 100644 --- a/generate_rospkg_apkbuild/APKBUILD.em.sh +++ b/generate_rospkg_apkbuild/APKBUILD.em.sh @@ -242,8 +242,8 @@ package() { # Tweak invalid RPATH find $pkgdir -name "*.so" | while read so; do chrpath_out=$(chrpath ${so} || true) - if echo ${chrpath_out} | grep -q "RPATH="; then - rpath=$(echo -n "${chrpath_out}" | sed -e "s/^.*RPATH=//") + if echo ${chrpath_out} | grep -q "R\(UN\)\?PATH="; then + rpath=$(echo -n "${chrpath_out}" | sed -e "s/^.*R\(UN\)\?PATH=//") if echo "${rpath}" | grep -q -e "\(home\|aports\)"; then echo "RPATH contains home/aports!: ${rpath}" rpathfix=$(echo -n "${rpath}" | tr ":" "\n" \