diff options
| author | Jay Freeman <saurik@saurik.com> | 2008-06-28 18:44:49 +0000 |
|---|---|---|
| committer | Jay Freeman <saurik@saurik.com> | 2008-06-28 18:44:49 +0000 |
| commit | 56af309dadc4a25af2cb5f31b55202de39c7ed6c (patch) | |
| tree | 531a960f1789759b0357b047aba19619c62b1bd1 /util | |
| parent | ec0937ea2d61c2b0081326c063bcfc11afda22e0 (diff) | |
Multiple find.sh matches were being handled poorly.
git-svn-id: http://svn.telesphoreo.org/trunk@344 514c082c-b64e-11dc-b46d-3d985efe055d
Diffstat (limited to 'util')
| -rwxr-xr-x | util/find.sh | 2 | ||||
| -rw-r--r-- | util/libtool.diff | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/util/find.sh b/util/find.sh index d45bea76b..4e0a04846 100755 --- a/util/find.sh +++ b/util/find.sh @@ -7,7 +7,7 @@ while [[ $# -ne 0 ]]; do if [[ $1 == /* ]]; then unset found - found=$(echo "${PKG_PATH}:" | while read -r -d ':' path; do + found=$(echo "${PKG_PATH}:" | while IFS= read -r -d : path; do if [[ -e ${path}$1 ]]; then if [[ ${found+@} ]]; then echo -n ':' diff --git a/util/libtool.diff b/util/libtool.diff index 59e210084..b466030ab 100644 --- a/util/libtool.diff +++ b/util/libtool.diff @@ -5,7 +5,7 @@ continue ;; - *.la) lib="$deplib" ;; -+ *.la) lib="$("${PKG_BASE}/util/find.sh" "$deplib")" ;; ++ *.la) lib="$("${PKG_BASE}/util/find.sh" "$deplib")"; lib="${lib%%:*}" ;; *.$libext) if test "$pass" = conv; then deplibs="$deplib $deplibs" |