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.

5 files changed, 5 insertions, 5 deletions

diff --git a/groups/000.host_tools.group b/groups/000.host_tools.group
index 6c9318b0..7e2b3358 100644
--- a/groups/000.host_tools.group
+++ b/groups/000.host_tools.group
@@ -27,6 +27,7 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_LIBTOOL_HOST_SHA256SUM:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f};
 : ${PKG_LIBTOOL_HOST_VERSION:=2.4.6};
 : ${PKG_LIBTOOL_HOST_URL:=https://ftp.gnu.org/gnu/libtool/libtool-${PKG_LIBTOOL_HOST_VERSION}.tar.xz};
+: ${PKG_LIBTOOL_HOST_LIBTOOL:=none};
 : ${PKG_M4_HOST_DEPENDS:="pkgconf_host slibtool_host"};
 : ${PKG_M4_HOST_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07};
 : ${PKG_M4_HOST_VERSION:=1.4.18};
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 584810c0..97b87d7e 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -92,7 +92,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_GLIB_HOST_BUILD_STEPS_DISABLE:=configure_patch};
 : ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--with-pcre=internal --with-python=${PREFIX}/bin/python3 --disable-dtrace --disable-libelf --disable-libmount"};
 : ${PKG_GLIB_HOST_CFLAGS_BUILD_EXTRA:="-Wno-missing-include-dirs -Wno-format-nonliteral -Wno-format-overflow"};
-: ${PKG_GLIB_HOST_ENV_VARS_EXTRA:="LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib -lffi"};
+: ${PKG_GLIB_HOST_ENV_VARS_EXTRA:="LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-3.2.1/include:LIBFFI_LIBS=-L${PREFIX}/lib -lffi"};
 : ${PKG_GLIB_HOST_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX}/lib};
 : ${PKG_GPERF_HOST_SHA256SUM:=588546b945bba4b70b6a3a616e80b4ab466e3f33024a352fc2198112cdbb3ae2};
 : ${PKG_GPERF_HOST_VERSION:=3.1};
diff --git a/groups/211.native_packages_cmdline.group b/groups/211.native_packages_cmdline.group
index eb277e50..feb5fed5 100644
--- a/groups/211.native_packages_cmdline.group
+++ b/groups/211.native_packages_cmdline.group
@@ -41,7 +41,7 @@ the_silver_searcher toilet tree terminally_tetris ubase which zsh")";
 : ${PKG_DOS2UNIX_SHA256SUM:=1cd58a60b03ed28fa39046102a185c5e88c4f7665e1e0417c25de7f8b9f78623};
 : ${PKG_DOS2UNIX_VERSION:=7.4.1};
 : ${PKG_DOS2UNIX_URL:=http://waterlan.home.xs4all.nl/dos2unix/dos2unix-${PKG_DOS2UNIX_VERSION}.tar.gz};
-: ${PKG_DOS2UNIX_CFLAGS_BUILD_EXTRA:=${PACKAGES_CFLAGS_CONFIGURE}};
+: ${PKG_DOS2UNIX_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_DOS2UNIX_IN_TREE:=1};
 : ${PKG_DOS2UNIX_INSTALL_FILES:="../dos2unix-${PKG_DOS2UNIX_VERSION}/dos2unix=bin/ ../dos2unix-${PKG_DOS2UNIX_VERSION}/unix2dos=bin/ @dos2unix=bin/mac2unix @unix2dos=bin/unix2mac"};
 : ${PKG_ED_SHA256SUM:=ad4489c0ad7a108c514262da28e6c2a426946fb408a3977ef1ed34308bdfd174};
diff --git a/groups/231.native_packages_etc.group b/groups/231.native_packages_etc.group
index 6ee80c64..b9e32e6e 100644
--- a/groups/231.native_packages_etc.group
+++ b/groups/231.native_packages_etc.group
@@ -351,7 +351,7 @@ zstd")";
 : ${PKG_ZSTD_SHA256SUM:=92e41b6e8dd26bbd46248e8aa1d86f1551bc221a796277ae9362954f26d605a9};
 : ${PKG_ZSTD_VERSION:=1.3.4};
 : ${PKG_ZSTD_URL:=https://github.com/facebook/zstd/archive/v${PKG_ZSTD_VERSION}.tar.gz};
-: ${PKG_ZSTD_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE}};
+: ${PKG_ZSTD_CFLAGS_BUILD_EXTRA:=${NATIVE_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_ZSTD_IN_TREE:=1};
 : ${PKG_ZSTD_SUBDIR:=zstd-${PKG_ZSTD_VERSION}};
 
diff --git a/groups/261.native_packages_x11.group b/groups/261.native_packages_x11.group
index 9e12c691..95d515f0 100644
--- a/groups/261.native_packages_x11.group
+++ b/groups/261.native_packages_x11.group
@@ -187,7 +187,6 @@ xtrans xwd xwin")";
 : ${PKG_LIBXT_SHA256SUM:=46eeb6be780211fdd98c5109286618f6707712235fdd19df4ce1e6954f349f1a};
 : ${PKG_LIBXT_VERSION:=1.1.5};
 : ${PKG_LIBXT_URL:=https://www.x.org/releases/individual/lib/libXt-${PKG_LIBXT_VERSION}.tar.bz2};
-: ${PKG_LIBXT_CFLAGS_CONFIGURE:=${PACKAGES_CFLAGS_CONFIGURE_DEFAULT}};
 : ${PKG_LIBXT_LDFLAGS_CONFIGURE:=-g};
 : ${PKG_LIBXTST_DEPENDS:="libX11 libXext libXi xorgproto"};
 : ${PKG_LIBXTST_SHA256SUM:=4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204};
@@ -239,7 +238,7 @@ xtrans xwd xwin")";
 : ${PKG_ST_VERSION:=0.7};
 : ${PKG_ST_URL:=https://dl.suckless.org/st/st-${PKG_ST_VERSION}.tar.gz};
 : ${PKG_ST_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_ST_CFLAGS_BUILD_EXTRA:=${LEAF_PACKAGES_CFLAGS_CONFIGURE} -I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include};
+: ${PKG_ST_CFLAGS_BUILD_EXTRA:="-I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include"};
 : ${PKG_ST_IN_TREE:=1};
 : ${PKG_ST_INSTALL_FILES:=../st-${PKG_ST_VERSION}/st=bin/ ../st-${PKG_ST_VERSION}/st.1=share/man/man1/ ../st-${PKG_ST_VERSION}/st.info=bin/};
 : ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig};