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

1 files changed, 10 insertions, 1 deletions

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};