diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2012-09-09 22:37:32 +0000 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2012-09-09 22:37:32 +0000 |
| commit | cfac78fcdc835be4a752d8049a8cd0277271781c (patch) | |
| tree | 027dd085e60d755603f485935ef7e727a3d62539 | |
| parent | 11c0146a2b4a5b9ca9e29aa3e86e7843b07f691a (diff) | |
| download | master-187ad058-cfac78fcdc835be4a752d8049a8cd0277271781c.tar.gz master-187ad058-cfac78fcdc835be4a752d8049a8cd0277271781c.tar.bz2 master-187ad058-cfac78fcdc835be4a752d8049a8cd0277271781c.zip | |
[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
| -rwxr-xr-x | scripts/bundle-libraries.sh | 6 |
1 files changed, 1 insertions, 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 |