vars/build.vars:{native_{packages{,_deps{,_x11}}},dev_packages,minipix}:${PKG_CONFIG_CACHE_LOCAL}: set from ${CONFIG_CACHE_GNULIB} (via midipix.)

vars/build.vars:${CONFIG_CACHE_GNULIB}, vars/gnulib.vars: merged.
vars/env.vars:${DEFAULT_BUILD_VARS}: adds provisional ${CONFIG_CACHE_LOCAL} variable.
subr/pkg_configure_autotools.subr: append ${PKG_CONFIG_CACHE_LOCAL} (provisional) to config.cache if non-empty prior to appending ${PKG_CONFIG_CACHE_EXTRA} if non-empty.

4 files changed, 135 insertions, 128 deletions

diff --git a/subr/pkg_configure_autotools.subr b/subr/pkg_configure_autotools.subr
index 5bbbee3c..4838717e 100644
--- a/subr/pkg_configure_autotools.subr
+++ b/subr/pkg_configure_autotools.subr
@@ -40,6 +40,10 @@ pkg_configure_autotools() {
 			if [ -n "${PKG_CONFIG_CACHE}" ]; then
 				echo "${PKG_CONFIG_CACHE}"						|\
 					tr " " "\n" > "${PKG_BUILD_DIR}/config.cache";
+				if [ -n "${PKG_CONFIG_CACHE_LOCAL}" ]; then
+					echo "${PKG_CONFIG_CACHE_LOCAL}"				|\
+						tr " " "\n" >> "${PKG_BUILD_DIR}/config.cache";
+				fi;
 				if [ -n "${PKG_CONFIG_CACHE_EXTRA}" ]; then
 					echo "${PKG_CONFIG_CACHE_EXTRA}"				|\
 						tr " " "\n" >> "${PKG_BUILD_DIR}/config.cache";
diff --git a/vars/build.vars b/vars/build.vars
index 9a8bc6cf..e0cae0f3 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -19,6 +19,131 @@ libffi_cv_hidden_visibility_attribute=yes
 xorg_cv_malloc0_returns_null=yes"};
 
 #
+# XXX revisit
+#
+: ${CONFIG_CACHE_GNULIB:="
+ac_cv_func___fseterr=yes
+gl_cv_func_cbrtl_ieee=yes
+gl_cv_func_ceilf_ieee=yes
+gl_cv_func_ceil_ieee=yes
+gl_cv_func_ceill_ieee=yes
+gl_cv_func_chown_ctime_works=yes
+gl_cv_func_chown_slash_works=yes
+gl_cv_func_exp2l_ieee=yes
+gl_cv_func_expm1_ieee=yes
+gl_cv_func_fcntl_f_dupfd_works=yes
+gl_cv_func_fdopendir_works=yes
+gl_cv_func_fflush_stdin=yes
+gl_cv_func_floorf_ieee=yes
+gl_cv_func_fmaf_works=yes
+gl_cv_func_fmal_works=yes
+gl_cv_func_fma_works=yes
+gl_cv_func_fmodf_ieee=yes
+gl_cv_func_fmod_ieee=yes
+gl_cv_func_fmodl_ieee=yes
+gl_cv_func_fpurge_works=yes
+gl_cv_func_fseeko=yes
+gl_cv_func_futimens_works=yes
+gl_cv_func_futimesat_works=yes
+gl_cv_func_getcwd_null=yes
+gl_cv_func_getgroups_works=yes
+gl_cv_func_gettimeofday_clobber=no
+gl_cv_func_hypotf_ieee=yes
+gl_cv_func_hypot_ieee=yes
+gl_cv_func_hypotl_ieee=yes
+gl_cv_func_isfinitel_works=yes
+gl_cv_func_isnanl_works=yes
+gl_cv_func_linkat_slash=yes
+gl_cv_func_link_works=yes
+gl_cv_func_log10f_ieee=yes
+gl_cv_func_log10_ieee=yes
+gl_cv_func_log1pf_ieee=yes
+gl_cv_func_log1p_ieee=yes
+gl_cv_func_log1pl_ieee=yes
+gl_cv_func_log2f_ieee=yes
+gl_cv_func_log2_ieee=yes
+gl_cv_func_logf_ieee=yes
+gl_cv_func_log_ieee=yes
+gl_cv_func_lstat_dereferences_slashed_symlink=yes
+gl_cv_func_mbrlen_empty_input=yes
+gl_cv_func_mbrtowc_empty_input=yes
+gl_cv_func_memchr_works=yes
+gl_cv_func_memmem_works_fast=yes
+gl_cv_func_mkdir_trailing_dot_works=yes
+gl_cv_func_mkdir_trailing_slash_works=yes
+gl_cv_func_mkfifo_works=yes
+gl_cv_func_mknod_works=yes
+gl_cv_func_modff_ieee=yes
+gl_cv_func_modf_ieee=yes
+gl_cv_func_modfl_ieee=yes
+gl_cv_func_nanosleep=yes
+gl_cv_func_open_directory_works=yes
+gl_cv_func_perror_works=yes
+gl_cv_func_printf_directive_a=yes
+gl_cv_func_printf_directive_f=yes
+gl_cv_func_printf_directive_n=yes
+gl_cv_func_printf_enomem=yes
+gl_cv_func_printf_flag_zero=yes
+gl_cv_func_printf_infinite_long_double=yes
+gl_cv_func_printf_infinite=yes
+gl_cv_func_printf_sizes_c99=yes
+gl_cv_func_pselect_detects_ebadf=yes
+gl_cv_func_ptsname_sets_errno=yes
+gl_cv_func_readlink_works=yes
+gl_cv_func_realpath_works=yes
+gl_cv_func_remainderf_ieee=yes
+gl_cv_func_remainder_ieee=yes
+gl_cv_func_remainderl_ieee=yes
+gl_cv_func_rename_dest_works=yes
+gl_cv_func_rename_link_works=yes
+gl_cv_func_rename_slash_dst_works=yes
+gl_cv_func_rename_slash_src_works=yes
+gl_cv_func_rmdir_works=yes
+gl_cv_func_roundf_ieee=yes
+gl_cv_func_round_ieee=yes
+gl_cv_func_select_detects_ebadf=yes
+gl_cv_func_setenv_works=yes
+gl_cv_func_signbit_gcc=yes
+gl_cv_func_signbit=yes
+gl_cv_func_sleep_works=yes
+gl_cv_func_snprintf_directive_n=yes
+gl_cv_func_snprintf_retval_c99=yes
+gl_cv_func_snprintf_truncation_c99=yes
+gl_cv_func_stat_dir_slash=yes
+gl_cv_func_stat_file_slash=yes
+gl_cv_func_stpncpy=yes
+gl_cv_func_strcasestr_linear=yes
+gl_cv_func_strchrnul_works=yes
+gl_cv_func_strerror_0_works=yes
+gl_cv_func_strstr_linear=yes
+gl_cv_func_strtod_works=yes
+gl_cv_func_svid_putenv=yes
+gl_cv_func_symlink_works=yes
+gl_cv_func_tdelete_works=yes
+gl_cv_func_truncf_ieee=yes
+gl_cv_func_trunc_ieee=yes
+gl_cv_func_truncl_ieee=yes
+gl_cv_func_tzset_clobber=no
+gl_cv_func_ungetc_works=yes
+gl_cv_func_unlink_honors_slashes=yes
+gl_cv_func_unsetenv_works=yes
+gl_cv_func_usleep_works=yes
+gl_cv_func_utimensat_works=yes
+gl_cv_func_vsnprintf_posix=yes
+gl_cv_func_vsnprintf_zerosize_c99=yes
+gl_cv_func_vsprintf_posix=yes
+gl_cv_func_wcwidth_works=yes
+gl_cv_func_working_getdelim=yes
+gl_cv_func_working_mkstemp=yes
+gl_cv_func_working_mktime=yes
+gl_cv_func_working_strerror=yes
+gl_cv_func_chown_follows_symlink=yes
+gl_cv_func_fchownat_nofollow_works=yes
+gl_cv_func_link_follows_symlink=yes
+gl_cv_func_linkat_nofollow=yes
+gl_cv_struct_dirent_d_ino=yes"};
+
+#
 # Build target host_tools
 #
 HOST_TOOLS_BUILD_TYPE="host";
@@ -468,6 +593,7 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 # Build target native_packages_deps
 #
 NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
 NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
 NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
@@ -788,6 +914,7 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 # Build target native_packages_deps_x11
 #
 NATIVE_PACKAGES_DEPS_X11_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_X11_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
 NATIVE_PACKAGES_DEPS_X11_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
 NATIVE_PACKAGES_DEPS_X11_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_X11_MAKEFLAGS_INSTALL="PREFIX= prefix=";
@@ -1008,6 +1135,7 @@ NATIVE_PACKAGES_DEPS_X11_PYTHON="${PREFIX}/bin/python2";
 # Build target dev_packages
 #
 DEV_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+DEV_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
 DEV_PACKAGES_CONFIGURE_ARGS="${NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS}";
 DEV_PACKAGES_LDFLAGS_CONFIGURE="${NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE}";
 DEV_PACKAGES_MAKEFLAGS_INSTALL="${NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL}";
@@ -1021,6 +1149,7 @@ DEV_PACKAGES_PYTHON="${PREFIX}/bin/python2";
 # Build target native_packages
 #
 NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
 NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
 NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix=";
@@ -1636,6 +1765,7 @@ ${NATIVE_PACKAGES_INET_PACKAGES}";
 # Build target minipix
 #
 MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+MINIPIX_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
 MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
 MINIPIX_LDFLAGS_BUILD="--sysroot=${PREFIX_NATIVE} -mvrfs";
 MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE} -mvrfs";
diff --git a/vars/env.vars b/vars/env.vars
index e946c36a..928f7bbd 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -7,7 +7,7 @@ DEFAULT_BUILD_STEPS="
 DEFAULT_BUILD_VARS="
 	AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC					\
 	CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA				\
-	CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIGURE				\
+	CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIG_CACHE_LOCAL CONFIGURE	\
 	CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA DEPS_BASE		\
 	DEPS_PARENT DESTDIR DISABLED ENV_VARS_EXTRA FNAME GITROOT INHERIT_FROM INSTALL_FILES	\
 	INSTALL_FILES INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET		\
diff --git a/vars/gnulib.vars b/vars/gnulib.vars
deleted file mode 100644
index 4b54a072..00000000
--- a/vars/gnulib.vars
+++ /dev/null
@@ -1,127 +0,0 @@
-#
-# set -o errexit -o noglob are assumed.
-#
-
-: ${PKG_GNULIB_CONFIG_CACHE_EXTRA:="
-ac_cv_func___fseterr=yes
-gl_cv_func_cbrtl_ieee=yes
-gl_cv_func_ceilf_ieee=yes
-gl_cv_func_ceil_ieee=yes
-gl_cv_func_ceill_ieee=yes
-gl_cv_func_chown_ctime_works=yes
-gl_cv_func_chown_slash_works=yes
-gl_cv_func_exp2l_ieee=yes
-gl_cv_func_expm1_ieee=yes
-gl_cv_func_fcntl_f_dupfd_works=yes
-gl_cv_func_fdopendir_works=yes
-gl_cv_func_fflush_stdin=yes
-gl_cv_func_floorf_ieee=yes
-gl_cv_func_fmaf_works=yes
-gl_cv_func_fmal_works=yes
-gl_cv_func_fma_works=yes
-gl_cv_func_fmodf_ieee=yes
-gl_cv_func_fmod_ieee=yes
-gl_cv_func_fmodl_ieee=yes
-gl_cv_func_fpurge_works=yes
-gl_cv_func_fseeko=yes
-gl_cv_func_futimens_works=yes
-gl_cv_func_futimesat_works=yes
-gl_cv_func_getcwd_null=yes
-gl_cv_func_getgroups_works=yes
-gl_cv_func_gettimeofday_clobber=no
-gl_cv_func_hypotf_ieee=yes
-gl_cv_func_hypot_ieee=yes
-gl_cv_func_hypotl_ieee=yes
-gl_cv_func_isfinitel_works=yes
-gl_cv_func_isnanl_works=yes
-gl_cv_func_linkat_slash=yes
-gl_cv_func_link_works=yes
-gl_cv_func_log10f_ieee=yes
-gl_cv_func_log10_ieee=yes
-gl_cv_func_log1pf_ieee=yes
-gl_cv_func_log1p_ieee=yes
-gl_cv_func_log1pl_ieee=yes
-gl_cv_func_log2f_ieee=yes
-gl_cv_func_log2_ieee=yes
-gl_cv_func_logf_ieee=yes
-gl_cv_func_log_ieee=yes
-gl_cv_func_lstat_dereferences_slashed_symlink=yes
-gl_cv_func_mbrlen_empty_input=yes
-gl_cv_func_mbrtowc_empty_input=yes
-gl_cv_func_memchr_works=yes
-gl_cv_func_memmem_works_fast=yes
-gl_cv_func_mkdir_trailing_dot_works=yes
-gl_cv_func_mkdir_trailing_slash_works=yes
-gl_cv_func_mkfifo_works=yes
-gl_cv_func_mknod_works=yes
-gl_cv_func_modff_ieee=yes
-gl_cv_func_modf_ieee=yes
-gl_cv_func_modfl_ieee=yes
-gl_cv_func_nanosleep=yes
-gl_cv_func_open_directory_works=yes
-gl_cv_func_perror_works=yes
-gl_cv_func_printf_directive_a=yes
-gl_cv_func_printf_directive_f=yes
-gl_cv_func_printf_directive_n=yes
-gl_cv_func_printf_enomem=yes
-gl_cv_func_printf_flag_zero=yes
-gl_cv_func_printf_infinite_long_double=yes
-gl_cv_func_printf_infinite=yes
-gl_cv_func_printf_sizes_c99=yes
-gl_cv_func_pselect_detects_ebadf=yes
-gl_cv_func_ptsname_sets_errno=yes
-gl_cv_func_readlink_works=yes
-gl_cv_func_realpath_works=yes
-gl_cv_func_remainderf_ieee=yes
-gl_cv_func_remainder_ieee=yes
-gl_cv_func_remainderl_ieee=yes
-gl_cv_func_rename_dest_works=yes
-gl_cv_func_rename_link_works=yes
-gl_cv_func_rename_slash_dst_works=yes
-gl_cv_func_rename_slash_src_works=yes
-gl_cv_func_rmdir_works=yes
-gl_cv_func_roundf_ieee=yes
-gl_cv_func_round_ieee=yes
-gl_cv_func_select_detects_ebadf=yes
-gl_cv_func_setenv_works=yes
-gl_cv_func_signbit_gcc=yes
-gl_cv_func_signbit=yes
-gl_cv_func_sleep_works=yes
-gl_cv_func_snprintf_directive_n=yes
-gl_cv_func_snprintf_retval_c99=yes
-gl_cv_func_snprintf_truncation_c99=yes
-gl_cv_func_stat_dir_slash=yes
-gl_cv_func_stat_file_slash=yes
-gl_cv_func_stpncpy=yes
-gl_cv_func_strcasestr_linear=yes
-gl_cv_func_strchrnul_works=yes
-gl_cv_func_strerror_0_works=yes
-gl_cv_func_strstr_linear=yes
-gl_cv_func_strtod_works=yes
-gl_cv_func_svid_putenv=yes
-gl_cv_func_symlink_works=yes
-gl_cv_func_tdelete_works=yes
-gl_cv_func_truncf_ieee=yes
-gl_cv_func_trunc_ieee=yes
-gl_cv_func_truncl_ieee=yes
-gl_cv_func_tzset_clobber=no
-gl_cv_func_ungetc_works=yes
-gl_cv_func_unlink_honors_slashes=yes
-gl_cv_func_unsetenv_works=yes
-gl_cv_func_usleep_works=yes
-gl_cv_func_utimensat_works=yes
-gl_cv_func_vsnprintf_posix=yes
-gl_cv_func_vsnprintf_zerosize_c99=yes
-gl_cv_func_vsprintf_posix=yes
-gl_cv_func_wcwidth_works=yes
-gl_cv_func_working_getdelim=yes
-gl_cv_func_working_mkstemp=yes
-gl_cv_func_working_mktime=yes
-gl_cv_func_working_strerror=yes
-gl_cv_func_chown_follows_symlink=yes
-gl_cv_func_fchownat_nofollow_works=yes
-gl_cv_func_link_follows_symlink=yes
-gl_cv_func_linkat_nofollow=yes
-gl_cv_struct_dirent_d_ino=yes"};
-
-# vim:filetype=sh