X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=scripts%2Fbundle-libraries.sh;h=869286bdba303b9f3905c43cef372e9afe68fecb;hb=7559d9dda9d8fd0485a285842810d49a30004927;hp=34cd08e78790f70b70ad84a8e64f962fd147d8ac;hpb=f175e728fb8f4868cddbcbd2363690fd8d11e232;p=openwrt.git

diff --git a/scripts/bundle-libraries.sh b/scripts/bundle-libraries.sh
index 34cd08e787..869286bdba 100755
--- a/scripts/bundle-libraries.sh
+++ b/scripts/bundle-libraries.sh
@@ -1,9 +1,8 @@
 #!/usr/bin/env bash
 #
 #   Script to install host system binaries along with required libraries.
-#   Refer to the --help output for more information.
 #
-#   Copyright (C) 2012 Jo-Philipp Wich <jow@openwrt.org>
+#   Copyright (C) 2012-2013 Jo-Philipp Wich <jow@openwrt.org>
 #
 #   This program is free software; you can redistribute it and/or modify
 #   it under the terms of the GNU General Public License as published by
@@ -74,16 +73,12 @@ for BIN in "$@"; do
 				*) echo " * lib: ${token##*/}" ;;
 			esac
 
-			dest="$DIR/bundled/lib/${token#*/lib*/}"
+			dest="$DIR/bundled/lib/${token##*/}"
 			ddir="${dest%/*}"
 
 			[ -f "$token" -a ! -f "$dest" ] && {
 				_md "$ddir"
 				_cp "$token" "$dest"
-
-				case "$token" in */tls/*.so*)
-					_cp "${token%/tls/*}/${token##*/}" "$DIR/bundled/lib/${token##*/}"
-				;; esac
 			}
 		;; esac
 	done
@@ -94,17 +89,19 @@ for BIN in "$@"; do
 	if [ -n "$LDSO" ]; then
 		_cp "$BIN" "$DIR/bundled/${BIN##*/}"
 
-		[ -x "$DIR/bundled/run.sh" ] || {
-			cat <<-EOF > "$DIR/bundled/run.sh"
+		RUN="${LDSO#ld-}"; RUN="run-${RUN%%.so*}.sh"
+
+		[ -x "$DIR/bundled/$RUN" ] || {
+			cat <<-EOF > "$DIR/bundled/$RUN"
 				#!/usr/bin/env bash
 				dir="\$(dirname "\$0")"
 				bin="\$(basename "\$0")"
 				exec -a "\$0" "\$dir/bundled/lib/$LDSO" --library-path "\$dir/bundled/lib" "\$dir/bundled/\$bin" "\$@"
 			EOF
-			chmod ${VERBOSE:+-v} 0755 "$DIR/bundled/run.sh"
+			chmod ${VERBOSE:+-v} 0755 "$DIR/bundled/$RUN"
 		}
 
-		_ln "./bundled/run.sh" "$DIR/${BIN##*/}"
+		_ln "./bundled/$RUN" "$DIR/${BIN##*/}"
 
 	# is a static executable or non-elf binary
 	else