From 87214109a2e045fc9e0c055ad3208129a8cf8aa0 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz Date: Oct 11 2019 17:10:39 +0000 Subject: subr/ex_pkg_env.subr:exp_pkg_env_source(): unset ${LD_LIBRARY_PATH} given build target host_packages_deps. vars/ncurses{,tw}_host.vars: removed. --- diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr index bc4f9ce..d818f4e 100644 --- a/subr/ex_pkg_env.subr +++ b/subr/ex_pkg_env.subr @@ -33,6 +33,9 @@ exp_pkg_env_source() { ex_rtl_unset_vars $(ex_rtl_lfilter_not \ "$(set | awk -F= '/^PKG_/{print $1}' | sort)" \ "${_vars_set}"); + if [ "${_tgt_name}" = "host_packages_deps" ]; then + unset LD_LIBRARY_PATH; + fi; }; ex_pkg_env() { diff --git a/vars/ncurses_host.vars b/vars/ncurses_host.vars deleted file mode 120000 index b37b463..0000000 --- a/vars/ncurses_host.vars +++ /dev/null @@ -1 +0,0 @@ -ncursestw_host.vars \ No newline at end of file diff --git a/vars/ncursestw_host.vars b/vars/ncursestw_host.vars deleted file mode 100644 index 850a124..0000000 --- a/vars/ncursestw_host.vars +++ /dev/null @@ -1,13 +0,0 @@ -# -# set -o errexit -o noglob are assumed. -# - -pkg_ncurses_host_install_make_pre() { - unset LD_LIBRARY_PATH; -}; - -pkg_ncursestw_host_install_make_pre() { - pkg_ncurses_host_install_make_pre "${@}"; -}; - -# vim:filetype=sh