From 8a4338c602d8ee1eeddb8ede6b42414a6ccf7410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Wed, 29 Nov 2017 00:23:39 +0000 Subject: subr/pkg_configure_autotools.subr: create ${PKG_BUILD_DIR}/config.cache from ${PKG_CONFIG_CACHE{,_EXTRA}}. etc/config.cache, vars/*.vars: split into vars/*.vars. --- subr/pkg_configure_autotools.subr | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'subr') diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr index 6b6b3125..e6445002 100644 --- a/subr/pkg_configure_autotools.subr +++ b/subr/pkg_configure_autotools.subr @@ -37,7 +37,12 @@ pkg_configure_autotools() { -exec echo install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \; \ -exec install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" {} \;; if [ "${PKG_BUILD_TYPE}" != host ]; then - ex_build_fileop cp "${MIDIPIX_BUILD_PWD}/etc/config.cache" "${PKG_BUILD_DIR}/"; + if [ -n "${PKG_CONFIG_CACHE}" ]; then + echo "${PKG_CONFIG_CACHE}" > "${PKG_BUILD_DIR}/config.cache"; + if [ -n "${PKG_CONFIG_CACHE_EXTRA}" ]; then + echo "${PKG_CONFIG_CACHE_EXTRA}" >> "${PKG_BUILD_DIR}/config.cache"; + fi; + fi; sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache"; fi; fi; -- cgit v1.2.3