From 4d31c6953d8c38a03b1be101ea7d57176e6ad0ad Mon Sep 17 00:00:00 2001 From: =?utf8?q?Arkadiusz=20Mi=C5=9Bkiewicz?= Date: Wed, 17 Apr 2013 22:57:27 +0200 Subject: [PATCH] - handle RUNPATH, too --- rpm-build-macros.spec | 2 +- rpm.macros | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rpm-build-macros.spec b/rpm-build-macros.spec index 881a645..f318959 100644 --- a/rpm-build-macros.spec +++ b/rpm-build-macros.spec @@ -1,4 +1,4 @@ -%define rpm_macros_rev 1.659 +%define rpm_macros_rev 1.660 %define find_lang_rev 1.36 Summary: PLD Linux RPM build macros Summary(pl.UTF-8): Makra do budowania pakietów RPM dla Linuksa PLD diff --git a/rpm.macros b/rpm.macros index 93f5872..124af73 100644 --- a/rpm.macros +++ b/rpm.macros @@ -631,7 +631,7 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \ fi; }; __spec_install_post_strip } } } #----------------------------------------------------------------- -# remove all RPATH from executable binaries and shared object files +# remove all RPATH/RUNPATH from executable binaries and shared object files # # Requires: find, awk, cut, xargs, chrpath, uname # @@ -648,12 +648,12 @@ if [ -d "$RPM_BUILD_ROOT" ]; then \ objs=`echo "$files" | xargs -r -d'\\n' file | awk -F: '/ELF.*(executable.*dynamically linked|shared object)/ {print $1}'`; \ fi; \ if [ -n "$objs" ]; then \ - printf "Remove RPATH from %d executable binaries and shared object files.\n" $(echo "$objs" | wc -l); \ + printf "Remove RPATH/RUNPATH from %d executable binaries and shared object files.\n" $(echo "$objs" | wc -l); \ echo "$objs" | \ while read file; do \ rpath= ; \ chmod u+w "$file"; \ - for dir in $(chrpath -l "$file" | awk '/RPATH=/ { gsub(/.*RPATH=/,""); gsub(/:/," "); print $0 }'); do \ + for dir in $(chrpath -l "$file" | awk '/R(|UN)PATH=/ { gsub(/.*R(|UN)PATH=/,""); gsub(/:/," "); print $0 }'); do \ case $dir in \ '$ORIGIN' ) \ if [ "$rpath" = "" ] ; then rpath="$dir" ; \ -- 2.44.0