From a0bc864f8b69a7e0738ac182825320839c9bbdff Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Oct 29 2017 12:46:52 +0000 Subject: subr/pkg_install.subr:pkgp_install_dlltool(): pass basename of ${_so_fname} to ${PKG_TARGET}-mdso (via midipix.) subr/pkg_install.subr:pkgp_install_dlltool(): don't skip ${_so_fname} even if -e ${PKG_PREFIX}/lib/${_so_fname##*/}. --- diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr index 7661cf0..de1594e 100644 --- a/subr/pkg_install.subr +++ b/subr/pkg_install.subr @@ -30,14 +30,13 @@ pkgp_install_dlltool() { _lib_fname="${_so_name}${_so_fname_ver:+.${_so_fname_ver}}.lib.a"; if [ -e "${_lib_fname}" ] \ || [ -e "${PKG_PREFIX}/lib/${_lib_fname}" ] \ - || [ ! -e "${PKG_PREFIX}/lib/$(basename "${_so_fname}")" ] \ || [ "$(readlink -f "${_so_fname}")" = "/dev/null" ]; then continue; else echo perk -e "${_so_fname}" \|\ - ${PKG_TARGET}-mdso -i ${_lib_fname} -n "${_so_fname}" - + ${PKG_TARGET}-mdso -i ${_lib_fname} -n "${_so_fname##*/}" - perk -e "${_so_fname}" |\ - ${PKG_TARGET}-mdso -i ${_lib_fname} -n "${_so_fname}" - + ${PKG_TARGET}-mdso -i ${_lib_fname} -n "${_so_fname##*/}" - build_fileop cp "${_lib_fname}" "${PKG_PREFIX}/lib"; fi; done;