From c70e919ae87003be253c6fc838603c128e4d0f8f Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sun, 9 Sep 2012 22:37:32 +0000 Subject: [PATCH] fix library bundling when host libraries reside in /lib/tls/ or similar SVN-Revision: 33353 --- scripts/bundle-libraries.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/scripts/bundle-libraries.sh b/scripts/bundle-libraries.sh index 34cd08e787..08b52b9906 100755 --- a/scripts/bundle-libraries.sh +++ b/scripts/bundle-libraries.sh @@ -74,16 +74,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