From e1d4697bc4af580c8bbdb8256fdc90626e18a226 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Sun, 15 Mar 2020 12:44:26 +0000
Subject: Set -o nounset in addition to +o errexit -o nounset.

groups/000.host_tools.group:libtool_host:${PKG_LIBTOOL}: build w/ `none'.
subr/build_init.subr:buildp_init_getopts(): set ${DEFAULT_BUILD_CPUS} prior to ex_pkg_load_vars() call.
subr/pkg_{build,install_make}.subr: only pass `LIBTOOL=${PKG_LIBTOOL}' if set and not `none'.
vars/libtool_host.vars: removes obsolete vars file.
---
 vars/texinfo.vars | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'vars/texinfo.vars')

diff --git a/vars/texinfo.vars b/vars/texinfo.vars
index 7e9aaa64..a23f8642 100644
--- a/vars/texinfo.vars
+++ b/vars/texinfo.vars
@@ -1,17 +1,17 @@
 #
-# set +o errexit -o noglob is assumed.
+# set +o errexit -o noglob -o nounset is assumed.
 #
 
 pkg_texinfo_build_pre() {
 	if ! rtl_run_cmd_unsplit make								\
-			${PKG_MAKEFLAGS_BUILD}							\
-			${PKG_MAKEFLAGS_BUILD_EXTRA}						\
-			"LIBTOOL=${PKG_LIBTOOL:-slibtool}"					\
+			${PKG_MAKEFLAGS_BUILD:-}						\
+			${PKG_MAKEFLAGS_BUILD_EXTRA:-}						\
+			${PKG_LIBTOOL:+"LIBTOOL=${PKG_LIBTOOL}"}				\
 			-C tools								\
 	|| ! rtl_run_cmd_unsplit make								\
-			${PKG_MAKEFLAGS_BUILD}							\
-			${PKG_MAKEFLAGS_BUILD_EXTRA}						\
-			"LIBTOOL=${PKG_LIBTOOL:-slibtool}"					\
+			${PKG_MAKEFLAGS_BUILD:-}						\
+			${PKG_MAKEFLAGS_BUILD_EXTRA:-}						\
+			${PKG_LIBTOOL:+"LIBTOOL=${PKG_LIBTOOL}"}				\
 			LDFLAGS="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib" LIBS="-ltinfo"	\
 			-C "tools/info"; then
 		return 1;
-- 
cgit v1.2.3