From bf9edfaed49c4387e181be454602e0cc65fe4382 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 1 Mar 2020 21:09:37 +0000
Subject: General cleanup, pt. III.

dist/dist_digest.dist: removes obsolete dist file.
etc/{build.usage,README.md}: updated.
groups/000.host_tools.group:{autoconf,automake,gettext_tiny,install_strip,libtool,m4}_host: moved from groups/010.host_deps.group.
groups/221.native_packages_dev.group:lua: moved from groups/231.native_packages_etc.group.
groups/221.native_packages_dev.group:lua:${PKG_FORCE_AUTORECONF}: set.
groups/231.native_packages_etc.group:{mlogin,tdnf}:${PKG_FORCE_AUTORECONF}: set.
groups/241.native_packages_inet.group:nullmailer:${PKG_FORCE_AUTORECONF}: set.
groups/251.native_packages_lib.group:lib{asr,gpg_error}:${PKG_FORCE_AUTORECONF}: set.
midipix.env, etc/README.md, subr/pkg_configure_autotools.subr: adds FORCE_NO_AUTORECONF.
subr/rtl_fileop.subr: adds ch{mod,own} fileops.
vars/{check_updates,jamvm,lib{asr,gpg_error},lua,mlogin,tdnf}.vars: removes obsolete vars file.
---
 subr/pkg_configure_autotools.subr | 36 +++++++++++++++++++++++++++---------
 1 file changed, 27 insertions(+), 9 deletions(-)

(limited to 'subr/pkg_configure_autotools.subr')

diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr
index bc3b6c23..d28cc8e1 100644
--- a/subr/pkg_configure_autotools.subr
+++ b/subr/pkg_configure_autotools.subr
@@ -7,6 +7,10 @@ pkg_configure_autotools() {
 	if rtl_exists_any "${PKG_BASE_DIR}/${PKG_SUBDIR}"							\
 			"config.guess" "configure.ac" "configure.in" "configure";
 	then	rtl_export_vars PKG_CONFIG "${PKG_PKG_CONFIG}" PKG_CONFIG_PATH "${PKG_PKG_CONFIG_PATH}";
+		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 _fname in bootstrap bootstrap.sh autogen.sh; do
@@ -15,16 +19,26 @@ pkg_configure_autotools() {
 							"${PKG_BASE_DIR}/${PKG_SUBDIR}/build-aux"		\
 							"${PKG_BASE_DIR}/${PKG_SUBDIR}";
 					do	if [ -e "${_subdir_tgt}" ]; then
-							rtl_fileop install -m 0700				\
-								"${MIDIPIX_BUILD_PWD}/etc/config.sub"		\
-								"${_subdir_tgt}/config.sub" || return "${?}" && break;
+							if ! rtl_fileop install -m 0700				\
+									"${MIDIPIX_BUILD_PWD}/etc/config.sub"	\
+									"${_subdir_tgt}/config.sub"; then
+								return 1;
+							else
+								break;
+							fi;
 						fi;
 					done;
-					(rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" &&			\
-						/bin/sh "${_fname}") || return "${?}" && break;
+					if ! (rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" &&			\
+							/bin/sh "${_fname}"); then
+						return 1;
+					else
+						break;
+					fi;
 				fi;
 			done;
-			(rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoconf) || return "${?}";
+			if ! (rtl_fileop cd "${PKG_BASE_DIR}/${PKG_SUBDIR}" && autoconf); then
+				return 1;
+			fi;
 		fi;
 		for _fname in $(find "${PKG_BASE_DIR}/${PKG_SUBDIR}" -name config.sub); do
 			if ! rtl_fileop mv "${_fname}" "${_fname}.orig"\
@@ -39,10 +53,14 @@ pkg_configure_autotools() {
 						"${PKG_CONFIG_CACHE}"						\
 						"${PKG_CONFIG_CACHE_LOCAL}"					\
 						"${PKG_CONFIG_CACHE_EXTRA}";
-				do	echo "${_config_cache}"							|\
-						tr " " "\n" >> "${PKG_BUILD_DIR}/config.cache" || return "${?}";
+				do	if ! echo "${_config_cache}"						|\
+							tr " " "\n" >> "${PKG_BUILD_DIR}/config.cache"; then
+						return 1;
+					fi;
 				done;
-				sed -i"" "s,%PREFIX%,${PKG_PREFIX},g" "${PKG_BUILD_DIR}/config.cache" || return "${?}";
+				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_PATH "${PKG_PKG_CONFIG_PATH}";
-- 
cgit v1.2.3