Generalise subr.pkg/pkg_configure_autotools.subr code.

5 files changed, 23 insertions, 104 deletions

diff --git a/subr.pkg/pkg_build.subr b/subr.pkg/pkg_build.subr
index 9ca2afce..f3ec51df 100644
--- a/subr.pkg/pkg_build.subr
+++ b/subr.pkg/pkg_build.subr
@@ -21,7 +21,7 @@ pkg_build() {
 		#	autoconf as it often abuses it by appending -std={gnu99,...} to it
 		#	instead of amending CFLAGS.
 		#
-		ex_rtl_run_make									\
+		ex_rtl_make									\
 			"${PKG_AR}" "${PKG_CC}" "${PKG_CXX}" "${PKG_CCLD}" "${PKG_LIBTOOL}"	\
 			"${PKG_MAKE}" "${PKG_PKG_CONFIG}" "${PKG_RANLIB}"			\
 			--									\
diff --git a/subr.pkg/pkg_build_clean.subr b/subr.pkg/pkg_build_clean.subr
index f93577ec..c9ba0e86 100644
--- a/subr.pkg/pkg_build_clean.subr
+++ b/subr.pkg/pkg_build_clean.subr
@@ -17,7 +17,7 @@ pkg_build_clean() {
 				_pbc_subdir="";
 			fi;
 
-			ex_rtl_run_make									\
+			ex_rtl_make									\
 				"${PKG_AR}" "${PKG_CC}" "${PKG_CXX}" "${PKG_CCLD}" "${PKG_LIBTOOL}"	\
 				"${PKG_MAKE}" "${PKG_PKG_CONFIG}" "${PKG_RANLIB}"			\
 				--									\
diff --git a/subr.pkg/pkg_configure.subr b/subr.pkg/pkg_configure.subr
index 8d75b6f7..3148e88b 100644
--- a/subr.pkg/pkg_configure.subr
+++ b/subr.pkg/pkg_configure.subr
@@ -13,7 +13,7 @@ pkgp_configure_autotools() {
 	then
 		_ppca_rc=2;
 	else
-		ex_rtl_run_configure								\
+		ex_rtl_configure								\
 			"${PKG_AR}" "${PKG_CC}" "${PKG_CONFIGURE}" "${PKG_CXX}" "${PKG_LD}"	\
 			"${PKG_LIBTOOL}" "${PKG_PKG_CONFIG}" "${PKG_PYTHON:-}" "${PKG_RANLIB}"	\
 			--									\
@@ -53,7 +53,7 @@ pkgp_configure_cmake() {
 			esac;
 		esac;
 
-		ex_rtl_run_configure_cmake							\
+		ex_rtl_configure_cmake								\
 			"${PKG_AR}" "${PKG_CC}" "${ARG_CCACHE}" "${PKG_CMAKE}" "${PKG_CXX}"	\
 			"${PKG_LD}" "${PKG_PKG_CONFIG}" "${PKG_PYTHON:-}" "${PKG_RANLIB}"	\
 			--									\
diff --git a/subr.pkg/pkg_configure_autotools.subr b/subr.pkg/pkg_configure_autotools.subr
index b524de32..0a7a62d1 100644
--- a/subr.pkg/pkg_configure_autotools.subr
+++ b/subr.pkg/pkg_configure_autotools.subr
@@ -5,111 +5,30 @@
 
 pkg_configure_autotools() {
 	local	_pca_group_name="${1}" _pca_pkg_name="${2}" _pca_restart_at="${3}"	\
-		_pca_config_cache="" _pca_config_guest_fname="" _pca_fname=""		\
-		_pca_subdir_tgt="";
+		_pca_rc=0;
 
 	if [ "${PKG_CONFIGURE_TYPE:+1}" = 1 ]\
 	&& [ "${PKG_CONFIGURE_TYPE}" != "autotools" ]; then
-		return 0;
-	fi;
-
-	if [ "${PKG_AUTOCONF_CONFIG_GUESS:-midipix}" = "midipix" ]; then
-		_pca_config_guest_fname="config.guess";
+		_pca_rc=0;
 	else
-		_pca_config_guest_fname="";
-	fi;
-
-	if rtl_exists_any "${PKG_BASE_DIR}/${PKG_SUBDIR}"				\
-			${_pca_config_guest_fname:+"${_pca_config_guest_fname}"}	\
-			"configure.ac" "configure.in" "configure";
-	then
-		rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}";
-
-		if [ "${PKG_FORCE_AUTORECONF:-0}" -eq 1 ]\
-		&& ! (cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoreconf -fiv); then
-			return 1;
-		fi;
-
-		if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure.ac" ]\
-		&& [ ! -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/configure" ]; then
-			for _pca_fname in bootstrap bootstrap.sh autogen.sh; do
-				if [ -e "${PKG_BASE_DIR}/${PKG_SUBDIR}/${_pca_fname}" ]; then
-					for _pca_subdir_tgt in \
-							"${PKG_BASE_DIR}/${PKG_SUBDIR}/build-aux"		\
-							"${PKG_BASE_DIR}/${PKG_SUBDIR}";
-					do	if [ -e "${_pca_subdir_tgt}" ]; then
-							if ! rtl_fileop install -m 0700				\
-									"${MIDIPIX_BUILD_PWD}/etc/config.sub"	\
-									"${_pca_subdir_tgt}/config.sub"; then
-								return 1;
-							fi;
-
-							if [ "${PKG_AUTOCONF_CONFIG_GUESS:-midipix}" = "midipix" ]; then
-								if ! rtl_fileop install -m 0700			\
-										"${MIDIPIX_BUILD_PWD}/etc/config.guess"\
-										"${_pca_subdir_tgt}/config.guess"; then
-									return 1;
-								else
-									break;
-								fi;
-							fi;
-						fi;
-					done;
-
-					if ! (rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" &&			\
-							/bin/sh "${_pca_fname}"); then
-						return 1;
-					else
-						break;
-					fi;
-				fi;
-			done;
-
-			if ! (rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoconf); then
-				return 1;
-			fi;
-		fi;
-
-		for _pca_fname in $(find "${PKG_BASE_DIR}/${PKG_SUBDIR}" -name config.sub); do
-			if ! rtl_fileop mv "${_pca_fname}" "${_pca_fname}.orig"\
-			|| ! rtl_fileop install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.sub" "${_pca_fname}"; then
-				return 1;
-			fi;
-		done;
-
-		if [ "${PKG_AUTOCONF_CONFIG_GUESS:-midipix}" = "midipix" ]; then
-			for _pca_fname in $(find "${PKG_BASE_DIR}/${PKG_SUBDIR}" -name config.guess); do
-				if ! rtl_fileop mv "${_pca_fname}" "${_pca_fname}.orig"\
-				|| ! rtl_fileop install -m 0700 "${MIDIPIX_BUILD_PWD}/etc/config.guess" "${_pca_fname}"; then
-					return 1;
-				fi;
-			done;
-		fi;
-
-		if [ "${PKG_BUILD_TYPE}" != host ]; then
-			if ! rtl_fileop touch "${PKG_BUILD_DIR}/config.cache"; then
-				return 1;
-			else
-				for _pca_config_cache in \
-						"${PKG_CONFIG_CACHE:-}"						\
-						"${PKG_CONFIG_CACHE_LOCAL:-}"					\
-						"${PKG_CONFIG_CACHE_EXTRA:-}";
-				do	if [ "${_pca_config_cache:+1}" = 1 ]\
-					&& ! printf "%s\n" "${_pca_config_cache}"					|\
-							tr " " "\n" >> "${PKG_BUILD_DIR}/config.cache"; then
-						return 1;
-					fi;
-				done;
-
-				if ! sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache"; then
-					return 1;
-				fi;
-			fi;
-		fi;
-		rtl_export_vars -u PKG_CONFIG "${PKG_PKG_CONFIG:-}" PKG_CONFIG_LIBDIR "${PKG_PKG_CONFIG_LIBDIR:-}";
+		ex_rtl_configure_prepare			\
+			"${PKG_BUILD_TYPE}"			\
+			"${PKG_BUILD_DIR}"			\
+			"${PKG_CONFIG_CACHE:-}"			\
+			"${PKG_CONFIG_CACHE_LOCAL:-}"		\
+			"${PKG_CONFIG_CACHE_EXTRA:-}"		\
+			"${MIDIPIX_BUILD_PWD}/etc/config.guess"	\
+			"${MIDIPIX_BUILD_PWD}/etc/config.sub"	\
+			"${PKG_AUTOCONF_CONFIG_GUESS:-copy}"	\
+			"${PKG_FORCE_AUTORECONF:-0}"		\
+			"${PKG_BASE_DIR}/${PKG_SUBDIR}"		\
+			"${PKG_PKG_CONFIG:-}"			\
+			"${PKG_PKG_CONFIG_LIBDIRG:-}"		\
+			"${PKG_PREFIX}";
+		_pca_rc="${?}";
 	fi;
 
-	return 0;
+	return "${_pca_rc}";
 };
 
 # vim:filetype=sh textwidth=0
diff --git a/subr.pkg/pkg_install_make.subr b/subr.pkg/pkg_install_make.subr
index fe255767..1fb896d7 100644
--- a/subr.pkg/pkg_install_make.subr
+++ b/subr.pkg/pkg_install_make.subr
@@ -17,7 +17,7 @@ pkg_install_make() {
 			_pim_subdir="";
 		fi;
 
-		ex_rtl_run_make										\
+		ex_rtl_make										\
 			"${PKG_AR}" "${PKG_CC}" "${PKG_CXX}" "${PKG_CCLD}" "${PKG_LIBTOOL}"		\
 			"${PKG_MAKE}" "${PKG_PKG_CONFIG}" "${_pim_ranlib}"				\
 			--										\