From 3eac319c2d53b1e5b2ba5a673efcd9f266ff6b8e Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de>
Date: Mar 08 2017 20:24:15 +0000
Subject: subr/pkg_setup_env.subr: don't log variables for flavoured packages when building an unflavoured package.


---

diff --git a/subr/pkg_setup_env.subr b/subr/pkg_setup_env.subr
index 72314ed..0f16815 100644
--- a/subr/pkg_setup_env.subr
+++ b/subr/pkg_setup_env.subr
@@ -57,11 +57,16 @@ pkg_setup_env() {
 		fi;
 	fi;
 	for __ in $(set); do
-		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} }${__%%=*}";
+		if [ -n "${_pkg_name_parent_uc}" ]; then
+			if [ "${__#PKG_${_pkg_name_uc}}" != "${__}" ]\
+			|| [ "${__#PKG_${_pkg_name_parent_uc}}" != "${__}" ]; then
+				_log_env_vars="${_log_env_vars:+${_log_env_vars} }${__%%=*}";
+			fi;
+		else
+			if [ "${__#PKG_${_pkg_name_uc}}" != "${__}" ]\
+			&& [ "${__#*_FLAVOUR_*}" = "${__}" ]; then
+				_log_env_vars="${_log_env_vars:+${_log_env_vars} }${__%%=*}";
+			fi;
 		fi;
 	done;
 	if [ -n "${_log_env_vars}" ]; then