X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Frstrip.sh;h=55caefc1a8cf463edb73b58d6de1e4ae376e14a7;hb=f00cb94f7ced064d74839892116c3a0b8f10c872;hp=4665ff5559c99c90a5b88eab9877c50d48ef62e7;hpb=c2590fe9309910c759a9b8a5dbcd7facffe8d982;p=openwrt%2Fstaging%2Fwigyori.git

diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh
index 4665ff5559..55caefc1a8 100755
--- a/scripts/rstrip.sh
+++ b/scripts/rstrip.sh
@@ -21,15 +21,25 @@ TARGETS=$*
 }
 
 find $TARGETS -type f -a -exec file {} \; | \
-  sed -n -e 's/^\(.*\):.*ELF.*\(executable\|relocatable\|shared object\).*,.* stripped/\1:\2/p' | \
+  sed -n -e 's/^\(.*\):.*ELF.*\(executable\|relocatable\|shared object\).*,.*/\1:\2/p' | \
 (
   IFS=":"
   while read F S; do
-    echo "$SELF: $F:$S"
+    echo "$SELF: $F: $S"
 	[ "${S}" = "relocatable" ] && {
 		eval "$STRIP_KMOD $F"
 	} || {
 		b=$(stat -c '%a' $F)
+		[ -z "$PATCHELF" ] || [ -z "$TOPDIR" ] || {
+			old_rpath="$($PATCHELF --print-rpath $F)"; new_rpath=""
+			for path in $old_rpath; do
+				case "$path" in
+					/lib/[^/]*|/usr/lib/[^/]*|\$ORIGIN/*) new_rpath="${new_rpath:+$new_rpath:}$path" ;;
+					*) echo "$SELF: $F: removing rpath $path" ;;
+				esac
+			done
+			[ "$new_rpath" = "$old_rpath" ] || $PATCHELF --set-rpath "$new_rpath" $F
+		}
 		eval "$STRIP $F"
 		a=$(stat -c '%a' $F)
 		[ "$a" = "$b" ] || chmod $b $F