vars/build.vars:gcc*: default ${PKG_GITROOT} to ${DEFAULT_GITROOT}.

vars/env.vars:${DEFAULT_BUILD_VARS}: adds GITROOT.
vars/gcc.vars: always use ${PKG_GITROOT}.
vars/gcc_{libstdcpp_v3,runtime}.vars: removes unused package vars.

5 files changed, 12 insertions, 7 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 91fdd64d..a9c5a142 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -87,6 +87,7 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_PREFIX:=${PREFIX}};
 : ${PKG_GCC_STAGE1_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_STAGE1_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
+: ${PKG_GCC_STAGE1_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_STAGE1_HOST_PREFIX:=${PREFIX}};
 : ${PKG_PSXSTUB_HOST_URLS_GIT:="psxstub=${DEFAULT_GITROOT}/psxstub"};
 : ${PKG_PSXSTUB_HOST_IN_TREE:=1};
@@ -96,16 +97,19 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_MUSL_NO_COMPLEX_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_no_complex-build};
 : ${PKG_GCC_RUNTIME_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_RUNTIME_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
+: ${PKG_GCC_RUNTIME_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_RUNTIME_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_RUNTIME_HOST_PREFIX:=${PREFIX}};
 : ${PKG_MUSL_FULL_HOST_VERSION:=1.1.12};
 : ${PKG_MUSL_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/musl_full-build};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_LIBSTDCPP_V3_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
+: ${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_FULL_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-build};
+: ${PKG_GCC_FULL_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_FULL_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_FULL_HOST_PREFIX:=${PREFIX}};
 : ${PKG_LDSO_HOST_URLS_GIT:=pemagine=${DEFAULT_GITROOT}/pemagine};
@@ -134,6 +138,7 @@ HOST_TOOLCHAIN_MINGW32_TARGET="x86_64-w64-mingw32";
 : ${PKG_BINUTILS_HOST_MINGW32_PREFIX:=${PREFIX}};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_VERSION:=4.6.4};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-build-mingw32};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_STAGE1_CROSS_MINGW32_PREFIX:=${PREFIX}};
 
 #
@@ -199,6 +204,7 @@ NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_MUSL_FULL_BASE_DIR:=${BUILD_WORKDIR}/musl-build-native};
 : ${PKG_GCC_FULL_VERSION:=4.6.4};
 : ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-build-native};
+: ${PKG_GCC_FULL_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_MDSO_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_CONFIGURE_ARGS:="--prefix=/usr --target=${DEFAULT_TARGET}"};
 : ${PKG_MDSO_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin @../../bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
@@ -217,8 +223,9 @@ NATIVE_TOOLCHAIN_MINGW32_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BINUTILS_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/binutils-${PKG_BINUTILS_MINGW32_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_MINGW32_LIBTOOL:=slibtool-static};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_VERSION:=4.6.4};
-: ${PKG_GCC_STAGE1_NATIVE_MINGW32_TARGET:=x86_64-w64-mingw32};
 : ${PKG_GCC_STAGE1_NATIVE_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-build-native-mingw32};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_TARGET:=x86_64-w64-mingw32};
 
 #
 # Build target native_runtime
diff --git a/vars/env.vars b/vars/env.vars
index a53858d3..004691ca 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -9,8 +9,8 @@ DEFAULT_BUILD_VARS="
 	CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA				\
 	CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIGURE				\
 	CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA DEPS_BASE		\
-	DEPS_PARENT DISABLED ENV_VARS_EXTRA FNAME INHERIT_FROM INSTALL_FILES INSTALL_FILES	\
-	DESTDIR	INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET		\
+	DEPS_PARENT DESTDIR DISABLED ENV_VARS_EXTRA FNAME GITROOT INHERIT_FROM INSTALL_FILES	\
+	INSTALL_FILES INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET		\
 	INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE			\
 	LDFLAGS_CONFIGURE_EXTRA	LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME		\
 	MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA		\
diff --git a/vars/gcc.vars b/vars/gcc.vars
index 76a1437f..f3ea88df 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -115,7 +115,7 @@ pkg_gcc_stage1_all() {
 	esac;
 	# GCC, stage1.
 	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
-		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${DEFAULT_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
+		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
 		ex_pkg_state_set "${PKG_NAME}" fetch -patch;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
@@ -262,7 +262,7 @@ pkg_gcc_full_all() {
 	# GCC, native.
 	pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native;
 	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
-		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${DEFAULT_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
+		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
 		ex_pkg_state_set "${PKG_NAME}" fetch -patch;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
diff --git a/vars/gcc_libstdcpp_v3.vars b/vars/gcc_libstdcpp_v3.vars
deleted file mode 120000
index 55c0ef10..00000000
--- a/vars/gcc_libstdcpp_v3.vars
+++ /dev/null
@@ -1 +0,0 @@
-gcc.vars
\ No newline at end of file
diff --git a/vars/gcc_runtime.vars b/vars/gcc_runtime.vars
deleted file mode 120000
index 55c0ef10..00000000
--- a/vars/gcc_runtime.vars
+++ /dev/null
@@ -1 +0,0 @@
-gcc.vars
\ No newline at end of file