summaryrefslogtreecommitdiffhomepage
path: root/subr/pkg_install.subr
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-10-27 16:47:39 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-10-27 16:47:39 +0000
commit70111511135644afe9e41304b5d7048772a8ee6b (patch)
tree9864d7c88d7e3f7fc1fb42c680f15c396aaa301b /subr/pkg_install.subr
parent1979b69d52194d5b5a2e7f7b3a6e834244e57ca6 (diff)
downloadmidipix_build-70111511135644afe9e41304b5d7048772a8ee6b.tar.bz2
midipix_build-70111511135644afe9e41304b5d7048772a8ee6b.tar.xz
subr/pkg_install.subr:pkgp_install_dlltool(): don't pass -printf to find(1) and correctly check for the existence of the target library archive.
Diffstat (limited to 'subr/pkg_install.subr')
-rw-r--r--subr/pkg_install.subr6
1 files changed, 3 insertions, 3 deletions
diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr
index ac963f7a..a22a4548 100644
--- a/subr/pkg_install.subr
+++ b/subr/pkg_install.subr
@@ -20,15 +20,15 @@ pkgp_install_dlltool() {
$(find \( -name "*.so" \
-or -name "*.so.*" \
-or -name "*.so.*.*" \
- -or -name "*.so.*.*.*" \) -printf '%P\n');
- do
+ -or -name "*.so.*.*.*" \) -print);
+ do _so_fname="${_so_fname#./}";
case "${_so_fname}" in
*.so) _so_fname_ver=""; ;;
*.so.*) _so_fname_ver="${_so_fname##*.so.}"; ;;
esac;
_so_name="${_so_fname%%.so*}";
_lib_fname="${_so_name}${_so_fname_ver:+.${_so_fname_ver}}.lib.a";
- if [ -e "${_lib_fname}" ] \
+ if [ -e "${PKG_PREFIX}/lib/${_lib_fname}" ] \
|| [ ! -e "${PKG_PREFIX}/lib/$(basename "${_so_fname}")" ] \
|| [ "$(readlink -f "${_so_fname}")" = "/dev/null" \) ]; then
continue;