From 48549ba666dd81312c25eb1cf2e9b1635ef5aff9 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?= <l.illanes@gmx.de>
Date: Wed, 15 Feb 2017 21:53:19 +0100
Subject: build.sh: set ${PKG_NAME_PARENT} for `flavoured' packages.
 subr/build.subr: fix bug in log_env_vars(). subr/pkg_setup_env.subr: inherit
 and log variables from parent packages when processing `flavoured' packages.
 vars/build.vars: replaces minipix packages w/
 {bash,coreutils}_flavour_minipix, which are statically linked and installed
 to ${PREFIX_MINIPIX}. vars/musl.vars: don't install libc.so to
 ${PREFIX_MINIPIX}/lib.

---
 subr/build.subr         |  6 +++---
 subr/pkg_setup_env.subr | 27 +++++++++++++++++++++------
 2 files changed, 24 insertions(+), 9 deletions(-)

(limited to 'subr')

diff --git a/subr/build.subr b/subr/build.subr
index 075575c2..91c03357 100644
--- a/subr/build.subr
+++ b/subr/build.subr
@@ -129,12 +129,12 @@ lmatch() {
 };
 
 log_env_vars() {
-	local _nvar _arg _arg_len_max;
+	local _nvar=1 _arg _arg_len_max=0;
 	log_msg info "Variables for this ${1:-build}:"; shift;
-	while [ ${_nvar:=0} -lt ${#} ]; do
+	while [ ${_nvar} -le ${#} ]; do
 		_arg="$(eval echo \${${_nvar}})";
 		_arg="${_arg%%=*}";
-		if [ ${#_arg} -gt ${_arg_len_max:=0} ]; then
+		if [ ${#_arg} -gt ${_arg_len_max} ]; then
 			_arg_len_max=${#_arg};
 		fi; : $((_nvar+=1));
 	done;
diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr
index 75bf5f96..72314edc 100644
--- a/subr/pkg_setup_env.subr
+++ b/subr/pkg_setup_env.subr
@@ -3,16 +3,28 @@
 #
 
 pkg_setup_env() {
-	local _pkg_name_uc _vars_fname _vname _build_uc __ _log_env_vars;
+	local	_pkg_name_uc _pkg_name_parent_uc				\
+		_vars_fname _vname _build_uc __ _log_env_vars;
 	_pkg_name_uc="$(echo ${PKG_NAME} | tr a-z A-Z)";
 	for _vars_fname in vars/${PKG_NAME}.vars; do
 		[ -e "${_vars_fname}" ] && . "${_vars_fname}";
 	done;
+	_build_uc="$(echo ${BUILD} | tr a-z A-Z)";
+	if [ -n "${PKG_NAME_PARENT}" ]; then
+		_pkg_name_parent_uc="$(echo ${PKG_NAME_PARENT} | tr a-z A-Z)";
+		for _vname in PREFIX ${PKG_BUILD_VARS}; do
+			for __ in "DEFAULT_${_vname}"				\
+				  "${BUILD_TARGET}_${_vname}"			\
+				  "PKG_${_pkg_name_parent_uc}_${_vname}"	\
+				  "PKG_${_pkg_name_parent_uc}_${_vname}_${_build_uc}"; do
+				set_var_unsafe "PKG_${_vname}" "$(get_var_unsafe ${__})";
+			done;
+		done;
+	fi;
 	for _vname in PREFIX ${PKG_BUILD_VARS}; do
-		_build_uc="$(echo ${BUILD} | tr a-z A-Z)";
-		for __ in "DEFAULT_${_vname}"			\
-			  "${BUILD_TARGET}_${_vname}"		\
-			  "PKG_${_pkg_name_uc}_${_vname}"	\
+		for __ in "DEFAULT_${_vname}"					\
+			  "${BUILD_TARGET}_${_vname}"				\
+			  "PKG_${_pkg_name_uc}_${_vname}"			\
 			  "PKG_${_pkg_name_uc}_${_vname}_${_build_uc}"; do
 			set_var_unsafe "PKG_${_vname}" "$(get_var_unsafe ${__})";
 		done;
@@ -45,7 +57,10 @@ pkg_setup_env() {
 		fi;
 	fi;
 	for __ in $(set); do
-		if [ "${__#PKG_${_pkg_name_uc}}" != "${__}" ]; then
+		if [ -n "${_pkg_name_parent_uc}" ]\
+		&& [ "${__#PKG_${_pkg_name_parent_uc}}" != "${__}" ]; then
+			_log_env_vars="${_log_env_vars:+${_log_env_vars} }${__%%=*}";
+		elif [ "${__#PKG_${_pkg_name_uc}}" != "${__}" ]; then
 			_log_env_vars="${_log_env_vars:+${_log_env_vars} }${__%%=*}";
 		fi;
 	done;
-- 
cgit v1.2.3