ipq40xx: add Edgecore OAP-100 support

[openwrt/openwrt.git] / scripts / bundle-libraries.sh

diff --git a/scripts/bundle-libraries.sh b/scripts/bundle-libraries.sh
index 4662b98dee9a77a3730fbe48888baef349d5bc0d..9efcbbd0b20e9eccaba51705f3b7776cd91efc70 100755 (executable)
--- a/scripts/bundle-libraries.sh
+++ b/scripts/bundle-libraries.sh
@@ -156,17 +156,16 @@ for BIN in "$@"; do
                                dest="$DIR/lib/${token##*/}"
                                ddir="${dest%/*}"
 
+                               case "$token" in
+                                       */ld-*.so*) LDSO="${token##*/}" ;;
+                               esac
+
                                [ -f "$token" -a ! -f "$dest" ] && {
                                        _md "$ddir"
                                        _cp "$token" "$dest"
                                        case "$token" in
-                                               *ld-*.so*)
-                                                       LDSO="${token##*/}"
-                                                       _patch_ldso "$dest"
-                                               ;;
-                                               libc.so.6|*/libc.so.6)
-                                                       _patch_glibc "$dest"
-                                               ;;
+                                               */ld-*.so*) _patch_ldso "$dest" ;;
+                                               */libc.so.6) _patch_glibc "$dest" ;;
                                        esac
                                }
                        ;; esac
@@ -187,7 +186,7 @@ for BIN in "$@"; do
                        #!/usr/bin/env bash
                        dir="\$(dirname "\$0")"
                        export RUNAS_ARG0="\$0"
-                       export LD_PRELOAD="\$dir/${REL:+$REL/}runas.so"
+                       export LD_PRELOAD="\${LD_PRELOAD:+\$LD_PRELOAD:}\$dir/${REL:+$REL/}runas.so"
                        exec "\$dir/${REL:+$REL/}$LDSO" --library-path "\$dir/${REL:+$REL/}" "\$dir/.${BIN##*/}.bin" "\$@"
                EOF