From: jow Date: Sun, 9 Sep 2012 22:37:32 +0000 (+0000) Subject: [scripts] fix library bundling when host libraries reside in /lib/tls/ or similar X-Git-Url: https://git.archive.openwrt.org/?p=openwrt.git;a=commitdiff_plain;h=79cadaa2aaaa7a6be76e6bee1e281475fbaa8fff [scripts] fix library bundling when host libraries reside in /lib/tls/ or similar git-svn-id: svn://svn.openwrt.org/openwrt/trunk@33353 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- 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