From 2b85d0a1de9ec57aab6293163d9885d76a47035c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?= Date: Tue, 25 Feb 2020 17:26:03 +0000 Subject: General cleanup, pt. I. --- subr/pkg_configure.subr | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) (limited to 'subr/pkg_configure.subr') diff --git a/subr/pkg_configure.subr b/subr/pkg_configure.subr index de6fd494..0adc7acf 100644 --- a/subr/pkg_configure.subr +++ b/subr/pkg_configure.subr @@ -1,18 +1,11 @@ # -# set -o errexit -o noglob are assumed. +# set +o errexit -o noglob is assumed. # pkg_configure() { + local _rc=0; if [ -x "${PKG_CONFIGURE}" ]; then - if [ -n "${PKG_PKG_CONFIG}" ]; then - export PKG_CONFIG="${PKG_PKG_CONFIG}"; - fi; - if [ -n "${PKG_PKG_CONFIG_PATH}" ]; then - export PKG_CONFIG_PATH="${PKG_PKG_CONFIG_PATH}"; - fi; - if [ -n "${PKG_PYTHON}" ]; then - export PYTHON="${PKG_PYTHON}"; - fi; + ex_rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH}" PYTHON "${PKG_PYTHON}"; AR="${PKG_AR}" \ CC="${PKG_CC}" \ RANLIB="${PKG_RANLIB}" \ @@ -20,10 +13,10 @@ pkg_configure() { CPPFLAGS="${PKG_CFLAGS_CONFIGURE}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}" \ CXXFLAGS="${PKG_CXXFLAGS_CONFIGURE}${PKG_CXXFLAGS_CONFIGURE_EXTRA:+ ${PKG_CXXFLAGS_CONFIGURE_EXTRA}}" \ LDFLAGS="${PKG_LDFLAGS_CONFIGURE}${PKG_LDFLAGS_CONFIGURE_EXTRA:+ ${PKG_LDFLAGS_CONFIGURE_EXTRA}}" \ - ${PKG_CONFIGURE} \ - ${PKG_CONFIGURE_ARGS} ${PKG_CONFIGURE_ARGS_EXTRA} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG}; - unset PKG_CONFIG PKG_CONFIG_PATH PYTHON; + "${PKG_CONFIGURE}" ${PKG_CONFIGURE_ARGS} ${PKG_CONFIGURE_ARGS_EXTRA} ${PKG_CONFIGURE_ARGS_EXTRA_DEBUG}; _rc="${?}" + ex_rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH}" PYTHON "${PKG_PYTHON}"; fi; + return "${?}"; }; # vim:filetype=sh -- cgit v1.2.3