From 1cbe2029e27bcfbce4f99c5788b66268255a1973 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?=
 <lucia@luciaillanes.de>
Date: Thu, 23 Mar 2023 14:52:54 +0100
Subject: Implements ccache integration, pt. II.

---
 subr.pkg/pkg_configure.subr | 49 +++++++++++++++++++++++++++++++++++----------
 1 file changed, 38 insertions(+), 11 deletions(-)

(limited to 'subr.pkg/pkg_configure.subr')

diff --git a/subr.pkg/pkg_configure.subr b/subr.pkg/pkg_configure.subr
index 743ab9d6..5403caea 100644
--- a/subr.pkg/pkg_configure.subr
+++ b/subr.pkg/pkg_configure.subr
@@ -25,15 +25,43 @@ pkgp_configure_autotools() {
 			PYTHON "${PKG_PYTHON:-}"			\
 			${_ppca_libtool:+MAKE} ${_ppca_libtool:+"make LIBTOOL=${_ppca_libtool}"};
 
-		AR="${PKG_AR}"												\
-		CC="${PKG_CC}"												\
-		RANLIB="${PKG_RANLIB}"											\
-		CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}"		\
-		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:-};
-		_ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+		if [ "${PKG_CONFIGURE_ARGS_LIST:+1}" = 1 ]; then
+			AR="${PKG_AR}"												\
+			CC="${PKG_CC}"												\
+			RANLIB="${PKG_RANLIB}"											\
+			CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}"		\
+			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}}"	\
+			rtl_run_cmdlineV ":" "${PKG_CONFIGURE}"									\
+				"${PKG_CONFIGURE_ARGS_LIST:-}"									\
+				"${PKG_CONFIGURE_ARGS_EXTRA_LIST:-}";
+			_ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+		elif [ "${PKG_CONFIGURE_ARGS_EXTRA_LIST:+1}" = 1 ]; then
+			AR="${PKG_AR}"												\
+			CC="${PKG_CC}"												\
+			RANLIB="${PKG_RANLIB}"											\
+			CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}"		\
+			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}}"	\
+			rtl_run_cmdlineV ":" "${PKG_CONFIGURE}"									\
+				${PKG_CONFIGURE_ARGS:-}										\
+				"${PKG_CONFIGURE_ARGS_EXTRA_LIST:-}";
+			_ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+		else
+			AR="${PKG_AR}"												\
+			CC="${PKG_CC}"												\
+			RANLIB="${PKG_RANLIB}"											\
+			CFLAGS="${PKG_CFLAGS_CONFIGURE:-}${PKG_CFLAGS_CONFIGURE_EXTRA:+ ${PKG_CFLAGS_CONFIGURE_EXTRA}}"		\
+			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:-};
+			_ppca_rc=$((${?} ? 1 : ${_ppca_rc}));
+		fi;
 
 		rtl_export_vars	-u					\
 			PKG_CONFIG "${PKG_PKG_CONFIG:-}"		\
@@ -177,8 +205,7 @@ pkgp_configure_sofort() {
 		RANLIB="${PKG_RANLIB}"				\
 			"${PKG_CONFIGURE}"			\
 				${PKG_CONFIGURE_ARGS:-}		\
-				${PKG_CONFIGURE_ARGS_EXTRA:-}	\
-				${PKG_CONFIGURE_ARGS_EXTRA_DEBUG:-};
+				${PKG_CONFIGURE_ARGS_EXTRA:-};
 		_ppcs_rc=$((${?} ? 1 : ${_ppcs_rc}));
 
 		for _ppcs_vname in ${_ppcs_vnames}; do
-- 
cgit v1.2.3