diff options
| -rw-r--r-- | rules.mk | 1 | ||||
| -rwxr-xr-x | scripts/rstrip.sh | 12 |
2 files changed, 12 insertions, 1 deletions
@@ -269,6 +269,7 @@ else NM="$(TARGET_CROSS)nm" \ STRIP="$(STRIP)" \ STRIP_KMOD="$(SCRIPT_DIR)/strip-kmod.sh" \ + PATCHELF="$(STAGING_DIR_HOST)/bin/patchelf" \ $(SCRIPT_DIR)/rstrip.sh endif diff --git a/scripts/rstrip.sh b/scripts/rstrip.sh index 4665ff5559..4e4232db60 100755 --- a/scripts/rstrip.sh +++ b/scripts/rstrip.sh @@ -25,11 +25,21 @@ find $TARGETS -type f -a -exec file {} \; | \ ( 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 |