Merge vars/* symbolic links into groups/* w/ ${PKG_VARS_FILE}.

5 files changed, 19 insertions, 1 deletions

diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 23c03607..01ca1c0b 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -26,6 +26,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_BINUTILS_BUILD_CONFIGURE_ARGS:="--disable-werror --enable-deterministic-archives --enable-install-libbfd --prefix=${PREFIX}/opt"};
 : ${PKG_BINUTILS_BUILD_LIBTOOL:=slibtool-static};
 : ${PKG_BINUTILS_BUILD_PREFIX:="${PREFIX}/opt"};
+: ${PKG_BINUTILS_BUILD_VARS_FILE:="vars/binutils.vars"};
 : ${PKG_BISON_HOST_DEPENDS:="readline_host"};
 : ${PKG_BISON_HOST_SHA256SUM:=67d68ce1e22192050525643fc0a7a22297576682bef6a5c51446903f5aeef3cf};
 : ${PKG_BISON_HOST_VERSION:=3.7.6};
@@ -48,6 +49,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_CA_CERTIFICATES_HOST_CFLAGS_BUILD_EXTRA:=-I${PREFIX}/include};
 : ${PKG_CA_CERTIFICATES_HOST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX}/lib};
 : ${PKG_CA_CERTIFICATES_HOST_ENV_VARS_EXTRA:="HOST_CC=gcc"};
+: ${PKG_CA_CERTIFICATES_HOST_VARS_FILE:="vars/ca_certificates.vars"};
 : ${PKG_CHAINPORT_HOST_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"};
 : ${PKG_CHAINPORT_HOST_BUILD_STEPS_DISABLE:="build"};
 : ${PKG_CHAINPORT_HOST_NO_LOG_VARS:=1};
@@ -110,6 +112,7 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_GDB_HOST_LDFLAGS_CONFIGURE_EXTRA:="-L${PREFIX}/lib"};
 : ${PKG_GDB_HOST_LIBTOOL:=rdlibtool};
 : ${PKG_GDB_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_HOST_VERSION}.midipix.patch"};
+: ${PKG_GDB_HOST_VARS_FILE:="vars/gdb.vars"};
 : ${PKG_GDBM_HOST_DEPENDS:="readline_host ncurses_host"};
 : ${PKG_GDBM_HOST_SHA256SUM:=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc};
 : ${PKG_GDBM_HOST_VERSION:=1.18.1};
diff --git a/groups/030.host_toolchain.group b/groups/030.host_toolchain.group
index 74fba85c..87a83706 100644
--- a/groups/030.host_toolchain.group
+++ b/groups/030.host_toolchain.group
@@ -23,6 +23,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="};
 : ${PKG_BINUTILS_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_HOST_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_HOST_PREFIX:=${PREFIX}};
+: ${PKG_BINUTILS_HOST_VARS_FILE:="vars/binutils.vars"};
 : ${PKG_BINUTILS_HOST_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_MINGW32_VERSION:=2.24.51};
 : ${PKG_BINUTILS_HOST_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.tar.bz2};
@@ -32,6 +33,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_HOST_MINGW32_PREFIX:=${PREFIX}};
 : ${PKG_BINUTILS_HOST_MINGW32_TARGET:="x86_64-w64-mingw32"};
+: ${PKG_BINUTILS_HOST_MINGW32_VARS_FILE:="vars/binutils.vars"};
 : ${PKG_GCC_FULL_HOST_DEPENDS:="gcc_stage1_host gcc_libstdcpp_v3_host ldso_host musl_full_host"};
 : ${PKG_GCC_FULL_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
@@ -39,26 +41,30 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GCC_FULL_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_FULL_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_FULL_HOST_PREFIX:=${PREFIX}};
+: ${PKG_GCC_FULL_HOST_VARS_FILE:="vars/gcc.vars"};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_DEPENDS:="gcc_runtime_host gcc_stage1_host ldso_host musl_full_host"};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_PREFIX:=${PREFIX}};
+: ${PKG_GCC_LIBSTDCPP_V3_HOST_VARS_FILE:="vars/gcc.vars"};
 : ${PKG_GCC_RUNTIME_HOST_DEPENDS:="gcc_stage1_host musl_no_complex_host psxstub_host"};
 : ${PKG_GCC_RUNTIME_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_RUNTIME_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
 : ${PKG_GCC_RUNTIME_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_RUNTIME_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_RUNTIME_HOST_PREFIX:=${PREFIX}};
+: ${PKG_GCC_RUNTIME_HOST_VARS_FILE:="vars/gcc.vars"};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_DEPENDS:="binutils_host_mingw32 gmp_host mpc_host mpfr_host"};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_VERSION:=4.6.4};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-x86_64-w64-mingw32};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_CONFIGURE_ARGS:="--disable-nls --prefix=${PREFIX} --target=x86_64-w64-mingw32"};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_CONFIGURE_ARGS:="--disable-nls --prefix=${PREFIX} --target=x86_64-w64-mingw32"};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_PREFIX:=${PREFIX}};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_TARGET:="x86_64-w64-mingw32"};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_VARS_FILE:="vars/gcc.vars"};
 : ${PKG_GCC_STAGE1_HOST_DEPENDS:="binutils_host gmp_host mpc_host mpfr_host"};
 : ${PKG_GCC_STAGE1_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_STAGE1_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
@@ -66,6 +72,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GCC_STAGE1_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_STAGE1_HOST_LDFLAGS_CONFIGURE:="-Wl,-rpath,${PREFIX}/lib"};
 : ${PKG_GCC_STAGE1_HOST_PREFIX:=${PREFIX}};
+: ${PKG_GCC_STAGE1_HOST_VARS_FILE:="vars/gcc.vars"};
 : ${PKG_GMP_HOST_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2};
 : ${PKG_GMP_HOST_VERSION:=6.1.2};
 : ${PKG_GMP_HOST_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_HOST_VERSION}.tar.bz2};
@@ -103,6 +110,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_MUSL_FULL_HOST_CONFIGURE:=build/mmglue/configure};
 : ${PKG_MUSL_FULL_HOST_CONFIGURE_ARGS:="--source-dir=../../musl-${PKG_MUSL_FULL_HOST_VERSION} --prefix= --target=${DEFAULT_TARGET} --sysroot=${PREFIX_CROSS}"};
 : ${PKG_MUSL_FULL_HOST_SUBDIR:=musl-${PKG_MUSL_FULL_HOST_VERSION}};
+: ${PKG_MUSL_FULL_HOST_VARS_FILE:="vars/musl.vars"};
 : ${PKG_MUSL_NO_COMPLEX_HOST_DEPENDS:="gcc_stage1_host"};
 : ${PKG_MUSL_NO_COMPLEX_HOST_SHA256SUM:=8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa};
 : ${PKG_MUSL_NO_COMPLEX_HOST_VERSION:=1.1.23};
@@ -114,6 +122,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_MUSL_NO_COMPLEX_HOST_CONFIGURE:=build/mmglue/configure};
 : ${PKG_MUSL_NO_COMPLEX_HOST_CONFIGURE_ARGS:="--source-dir=../../musl-${PKG_MUSL_NO_COMPLEX_HOST_VERSION} --no-complex --prefix= --target=${DEFAULT_TARGET} --sysroot=${PREFIX_CROSS}"};
 : ${PKG_MUSL_NO_COMPLEX_HOST_SUBDIR:=musl-${PKG_MUSL_NO_COMPLEX_HOST_VERSION}};
+: ${PKG_MUSL_NO_COMPLEX_HOST_VARS_FILE:="vars/musl.vars"};
 : ${PKG_NASM_HOST_SHA256SUM:=e24ade3e928f7253aa8c14aa44726d1edf3f98643f87c9d72ec1df44b26be8f5};
 : ${PKG_NASM_HOST_VERSION:=2.14.02};
 : ${PKG_NASM_HOST_URL:=http://www.nasm.us/pub/nasm/releasebuilds/${PKG_NASM_HOST_VERSION}/nasm-${PKG_NASM_HOST_VERSION}.tar.xz};
diff --git a/groups/110.native_toolchain.group b/groups/110.native_toolchain.group
index e8a45fe6..43afb52e 100644
--- a/groups/110.native_toolchain.group
+++ b/groups/110.native_toolchain.group
@@ -21,11 +21,13 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_MINGW32_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_MINGW32_PREFIX:="${PREFIX_NATIVE}"};
 : ${PKG_BINUTILS_MINGW32_LIBTOOL:=slibtool-static};
+: ${PKG_BINUTILS_MINGW32_VARS_FILE:="vars/binutils.vars"};
 : ${PKG_GCC_FULL_DEPENDS:="binutils gmp mpc mpfr musl_full"};
 : ${PKG_GCC_FULL_VERSION:=4.6.4};
 : ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-${DEFAULT_TARGET}};
 : ${PKG_GCC_FULL_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
 : ${PKG_GCC_FULL_GITROOT:=${DEFAULT_GITROOT}};
+: ${PKG_GCC_FULL_VARS_FILE:="vars/gcc.vars"};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_DEPENDS:="binutils_mingw32 gmp mpc mpfr"};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_VERSION:=4.6.4};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-x86_64-w64-mingw32};
@@ -34,6 +36,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_PREFIX:="${PREFIX_NATIVE}"};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_TARGET:=x86_64-w64-mingw32};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_VARS_FILE:="vars/gcc.vars"};
 : ${PKG_GMP_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2};
 : ${PKG_GMP_VERSION:=6.1.2};
 : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
@@ -59,5 +62,6 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MUSL_FULL_CONFIGURE:=build/mmglue/configure};
 : ${PKG_MUSL_FULL_CONFIGURE_ARGS:="--source-dir=../../musl-${PKG_MUSL_FULL_VERSION} --prefix= --target=${DEFAULT_TARGET} --sysroot=${PREFIX_CROSS}"};
 : ${PKG_MUSL_FULL_SUBDIR:=musl-${PKG_MUSL_FULL_VERSION}};
+: ${PKG_MUSL_FULL_VARS_FILE:="vars/musl.vars"};
 
 # vim:filetype=sh textwidth=0
diff --git a/groups/221.native_packages_dev.group b/groups/221.native_packages_dev.group
index 8f6a14bf..f50a73cd 100644
--- a/groups/221.native_packages_dev.group
+++ b/groups/221.native_packages_dev.group
@@ -54,6 +54,7 @@ ac_cv_prog_gnu_m4_gnu=yes"};
 : ${PKG_GDB_LIBTOOL:=rdlibtool};
 : ${PKG_GDB_MAKEFLAGS_BUILD_EXTRA:="SYSROOT_FLAGS=--sysroot=${PREFIX_NATIVE}"};
 : ${PKG_GDB_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_VERSION}.midipix.patch"};
+: ${PKG_GDB_VARS_FILES:="vars/gdb.vars"};
 : ${PKG_GENGETOPT_SHA256SUM:=b941aec9011864978dd7fdeb052b1943535824169d2aa2b0e7eae9ab807584ac};
 : ${PKG_GENGETOPT_VERSION:=2.23};
 : ${PKG_GENGETOPT_URL:=https://ftp.gnu.org/gnu/gengetopt/gengetopt-${PKG_GENGETOPT_VERSION}.tar.xz};
diff --git a/groups/241.native_packages_inet.group b/groups/241.native_packages_inet.group
index c5d400bd..14193a22 100644
--- a/groups/241.native_packages_inet.group
+++ b/groups/241.native_packages_inet.group
@@ -31,6 +31,7 @@ proxytunnel rsync socat thttpd w3m weechat wget whois")";
 : ${PKG_CA_CERTIFICATES_CFLAGS_BUILD_EXTRA:=-I${PREFIX_NATIVE}/include};
 : ${PKG_CA_CERTIFICATES_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_CA_CERTIFICATES_ENV_VARS_EXTRA:="HOST_CC=gcc"};
+: ${PKG_CA_CERTIFICATES_VARS_FILE:="vars/ca_certificates.vars"};
 : ${PKG_CURL_DEPENDS:="gnutls"};
 : ${PKG_CURL_SHA256SUM:=ef6e55192d04713673b4409ccbcb4cb6cd723137d6e10ca45b0c593a454e1720};
 : ${PKG_CURL_VERSION:=7.61.0};