From 4243a1676e1be4de207c850825c0e84c00b8151a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Luc=C3=ADa=20Andrea=20Illanes=20Albornoz?=
 <lucia@luciaillanes.de>
Date: Tue, 21 Mar 2023 11:05:34 +0100
Subject: Document subr.rtl/*.subr functions, pt. IV.

---
 subr.pkg/pkg_build.subr         | 34 ++++++++++++++++++----------------
 subr.pkg/pkg_build_clean.subr   |  5 +++--
 subr.pkg/pkg_install_files.subr |  2 +-
 subr.pkg/pkg_install_make.subr  | 13 ++++++++-----
 4 files changed, 30 insertions(+), 24 deletions(-)

(limited to 'subr.pkg')

diff --git a/subr.pkg/pkg_build.subr b/subr.pkg/pkg_build.subr
index 8eac6fc0..71b057b9 100644
--- a/subr.pkg/pkg_build.subr
+++ b/subr.pkg/pkg_build.subr
@@ -34,22 +34,24 @@ pkg_build() {
 		# N.B.	We only specify CC= here if the current package does not use GNU
 		#	autoconf as it often abuses it by appending -std={gnu99,...} to it
 		#	instead of amending CFLAGS.
-		rtl_run_cmd_unsplit "${PKG_MAKE}"							\
-			${PKG_MAKEFLAGS_BUILD:-}							\
-			${PKG_MAKEFLAGS_BUILD_EXTRA:-}							\
-			"AR=${PKG_AR}" "${_pb_no_autoconf:+CC=${PKG_CC}}" "RANLIB=${PKG_RANLIB}"	\
-			"${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}"				\
-			"${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}"			\
-			"${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}"				\
-			"${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}"		\
-			"${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}"				\
-			"${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}"		\
-			"${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}"				\
-			"${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}"		\
-			"${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}"				\
-			"${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}"		\
-			${_pb_libtool:+"LIBTOOL=${_pb_libtool}"}					\
-			${_pb_makeflags_verbosity}							\
+		rtl_run_cmdlineV ":" "${PKG_MAKE}"						\
+			${PKG_MAKEFLAGS_BUILD:-}						\
+			${PKG_MAKEFLAGS_BUILD_EXTRA:-}						\
+			"AR=${PKG_AR}"								\
+			"${_pb_no_autoconf:+CC=${PKG_CC}}"					\
+			"RANLIB=${PKG_RANLIB}"							\
+			"${PKG_CFLAGS_BUILD:+CFLAGS=${PKG_CFLAGS_BUILD}}"			\
+			"${PKG_CFLAGS_BUILD_EXTRA:+CFLAGS+=${PKG_CFLAGS_BUILD_EXTRA}}"		\
+			"${PKG_CPPFLAGS_BUILD:+CPPFLAGS=${PKG_CPPFLAGS_BUILD}}"			\
+			"${PKG_CPPFLAGS_BUILD_EXTRA:+CPPFLAGS+=${PKG_CPPFLAGS_BUILD_EXTRA}}"	\
+			"${PKG_CXXFLAGS_BUILD:+CXXFLAGS=${PKG_CXXFLAGS_BUILD}}"			\
+			"${PKG_CXXFLAGS_BUILD_EXTRA:+CXXFLAGS+=${PKG_CXXFLAGS_BUILD_EXTRA}}"	\
+			"${PKG_LDFLAGS_BUILD:+LDFLAGS=${PKG_LDFLAGS_BUILD}}"			\
+			"${PKG_LDFLAGS_BUILD_EXTRA:+LDFLAGS+=${PKG_LDFLAGS_BUILD_EXTRA}}"	\
+			"${PKG_PKG_CONFIG:+PKG_CONFIG=${PKG_PKG_CONFIG}}"			\
+			"${PKG_PKG_CONFIG_LIBDIR:+PKG_CONFIG_LIBDIR=${PKG_PKG_CONFIG_LIBDIR}}"	\
+			${_pb_libtool:+"LIBTOOL=${_pb_libtool}"}				\
+			${_pb_makeflags_verbosity}						\
 			${_pb_subdir:+-C "${_pb_subdir}"};
 		_pb_rc="${?}";
 
diff --git a/subr.pkg/pkg_build_clean.subr b/subr.pkg/pkg_build_clean.subr
index af312bd7..e3456031 100644
--- a/subr.pkg/pkg_build_clean.subr
+++ b/subr.pkg/pkg_build_clean.subr
@@ -20,13 +20,14 @@ pkg_build_clean() {
 			[ "${_pbc_subdir}" = ":" ] && _pbc_subdir="";
 			[ "${#_pbc_libtool}" -gt 0 ] && export MAKE="make LIBTOOL=${_pbc_libtool}";
 
-			rtl_run_cmd_unsplit "${PKG_MAKE}"			\
+			rtl_run_cmdlineV ":" "${PKG_MAKE}"			\
 				${PKG_MAKEFLAGS_BUILD:-}			\
 				${PKG_MAKEFLAGS_BUILD_EXTRA:-}			\
 				${_pbc_libtool:+"LIBTOOL=${_pbc_libtool}"}	\
 				${_pbc_makeflags_verbosity}			\
 				${_pbc_subdir:+-C "${_pbc_subdir}"}		\
-				clean; _pbc_rc="${?}";
+				clean;
+			_pbc_rc="${?}";
 
 			[ "${#_pbc_libtool}" -gt 0 ] && unset MAKE;
 			[ "${_pbc_rc}" -ne 0 ] && return 1;
diff --git a/subr.pkg/pkg_install_files.subr b/subr.pkg/pkg_install_files.subr
index e79f5bc0..204bab74 100644
--- a/subr.pkg/pkg_install_files.subr
+++ b/subr.pkg/pkg_install_files.subr
@@ -106,7 +106,7 @@ pkgp_install_files_strip() {
 		if [ "${_ppifs_stripfl:-0}" -eq 1 ]; then
 			for _ppifs_bin_path in $(find "${_ppifs_tree_root}" -perm /a=x -type f); do
 				if objdump -sj .debug_frame -j .debug_info "${_ppifs_bin_path}" >/dev/null 2>&1; then
-					rtl_log_msg "pkg_strip" "${MSG_pkg_strip}" "${_ppifs_bin_path}";
+					rtl_log_msgV "pkg_strip" "${MSG_pkg_strip}" "${_ppifs_bin_path}";
 					if ! "${PKG_TARGET}-strip" "${_ppifs_bin_path}"; then
 						return 1;
 					fi;
diff --git a/subr.pkg/pkg_install_make.subr b/subr.pkg/pkg_install_make.subr
index c88cff10..a3611b32 100644
--- a/subr.pkg/pkg_install_make.subr
+++ b/subr.pkg/pkg_install_make.subr
@@ -22,15 +22,18 @@ pkg_install_make() {
 			export MAKE="make LIBTOOL=${_pim_libtool}";
 		fi;
 
-		rtl_run_cmd_unsplit "${PKG_MAKE}"				\
+		rtl_run_cmdlineV ":" "${PKG_MAKE}"				\
 			${PKG_MAKEFLAGS_INSTALL:-}				\
 			${PKG_MAKEFLAGS_INSTALL_EXTRA:-}			\
-			AR="${PKG_AR}" CC="${PKG_CC}" RANLIB="${PKG_RANLIB}"	\
-			"${PKG_RANLIB_INSTALL:+RANLIB=${PKG_RANLIB_INSTALL}}"	\
+			AR="${PKG_AR}"						\
+			CC="${PKG_CC}"						\
+			RANLIB="${PKG_RANLIB}"					\
+			${PKG_RANLIB_INSTALL:+"RANLIB=${PKG_RANLIB_INSTALL}"}	\
 			${_pim_libtool:+"LIBTOOL=${_pim_libtool}"}		\
 			"${PKG_MAKE_INSTALL_VNAME:-DESTDIR}=${PKG_DESTDIR}/"	\
-			${PKG_INSTALL_TARGET:-install}				\
-			${_pim_subdir:+-C "${_pim_subdir}"}; _pim_rc="${?}";
+			"${PKG_INSTALL_TARGET:-install}"			\
+			${_pim_subdir:+-C "${_pim_subdir}"};
+		_pim_rc="${?}";
 
 		if [ "${#_pim_libtool}" -gt 0 ]; then
 			unset MAKE;
-- 
cgit v1.2.3