summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPatrick McDermott <patrick.mcdermott@libiquity.com>2019-03-22 17:02:14 (EDT)
committer Patrick McDermott <patrick.mcdermott@libiquity.com>2019-03-22 17:02:14 (EDT)
commit6baf644bc8a1eca666373c4ace3c6cad0fb341ff (patch)
tree72cb01f6d21fafec6fcb550c5c2fdf2b4c99da2c
parent592b82c5ac0c0e4556a7bf3813181684771bea6a (diff)
oh-shlibdeps: Fix library search path field splitting
-rw-r--r--NEWS9
-rw-r--r--configure.ac2
-rw-r--r--src/oh-shlibdeps.sh6
3 files changed, 10 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index e06e5a5..863c35e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,12 @@
+opkhelper version 3.1.2
+-----------------------
+
+Released: ????-??-??
+
+Changes in this release:
+
+ * Library search path field splitting has been fixed in oh-shlibdeps.
+
opkhelper version 3.1.1
-----------------------
diff --git a/configure.ac b/configure.ac
index 1a4eb84..85cfd52 100644
--- a/configure.ac
+++ b/configure.ac
@@ -15,7 +15,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
-AC_INIT([opkhelper], [3.1.1],
+AC_INIT([opkhelper], [3.1.2],
[mailto:proteanos-dev@lists.proteanos.com], [opkhelper],
[http://www.proteanos.com/dev/opkhelper/])
AC_CONFIG_AUX_DIR([build-aux])
diff --git a/src/oh-shlibdeps.sh b/src/oh-shlibdeps.sh
index 7e2d594..c56b39e 100644
--- a/src/oh-shlibdeps.sh
+++ b/src/oh-shlibdeps.sh
@@ -36,21 +36,16 @@ find_lib()
# Check just-built packages.
for pkg in *.data/; do
- IFS=':'
for dir in ${rtld_dirs}; do
- unset IFS
if [ -r "${pkg}/${dir}/${lib}" ]; then
printf '%s,\n' "${pkg%.data/}"
return 0
fi
done
- unset IFS
done
# Check installed packages.
- IFS=':'
for dir in ${rtld_dirs}; do
- unset IFS
if [ -r "${dir}/${lib}" ]; then
lib="${dir}/${lib}"
pkg="$('@OPKG@' search "${lib}" | sed 's/ - .*$//')"
@@ -63,7 +58,6 @@ find_lib()
fi
fi
done
- unset IFS
oh_warn "$(oh_get_msg 'shlib_no_lib')" "${lib}"
return 0