From c833fcd730484fa5270940c5596097d443fa86af Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de>
Date: Aug 24 2021 10:35:37 +0000
Subject: Adds ${PKG_VARS_FILE} package variable.


---

diff --git a/etc/README.md b/etc/README.md
index a5757da..b1ae6a2 100644
--- a/etc/README.md
+++ b/etc/README.md
@@ -642,6 +642,7 @@ VERSION`` and/or ``URLS_GIT``, respectively.
 | TARGET                       | Dash-separated {build,host,target} triplet                                                                                                  |
 | URL                          | URL to package archive, optionally appended with whitespace-separated list of alternative URLs                                              |
 | URLS_GIT                     | List of package Git URL(s) (``*name*=*URL*@*branch*``)                                                                                      |
+| VARS_FILE                    | Filename of optional package variables file (defaults to ``vars/${PKG_NAME}.vars``)                                                         |
 | VERSION                      | Package version                                                                                                                             |
   
 [Back to top](#table-of-contents)
diff --git a/midipix.env b/midipix.env
index 13f330e..ca414cf 100644
--- a/midipix.env
+++ b/midipix.env
@@ -35,7 +35,7 @@ DEFAULT_BUILD_VARS="											\
 	SOFORT_NATIVE_CFLAGS SOFORT_NATIVE_CFLAGS_EXTRA SOFORT_NATIVE_CXX				\
 	SOFORT_NATIVE_CXXFLAGS SOFORT_NATIVE_CXXFLAGS_EXTRA SOFORT_NATIVE_LD				\
 	SOFORT_NATIVE_LDFLAGS SOFORT_NATIVE_LDFLAGS_EXTRA SUBDIR TARGET URL				\
-	URLS_GIT VERSION";
+	URLS_GIT VARS_FILE VERSION";
 
 #
 # Prerequisite commands
diff --git a/subr/ex_pkg_env.subr b/subr/ex_pkg_env.subr
index c7d40dc..f3c3389 100644
--- a/subr/ex_pkg_env.subr
+++ b/subr/ex_pkg_env.subr
@@ -111,7 +111,7 @@ exp_pkg_env_set() {
 ex_pkg_env() {
 	local	_build_steps_default="${1}" _build_vars_default="${2}" _group_name="${3}"	\
 		_nounset="${4}" _pkg_name="${5}" _restart_at="${6}" _workdir="${7}" _vname="";
-	rtl_fileop source_opt "vars/${_pkg_name}.vars" "${_group_name}/${_pkg_name}.${_group_name}";
+	rtl_fileop source_opt "${PKG_VARS_FILE:-vars/${_pkg_name}.vars}" "${_group_name}/${_pkg_name}.${_group_name}";
 	if ! exp_pkg_env_set "${_build_vars_default}" "${_group_name}" "${_nounset}" "${_pkg_name}"\
 	|| ! exp_pkg_env_defaults "${_build_steps_default}" "${_pkg_name}" "${_workdir}"; then
 		return 1;