From 10ff54eb9e65ad8b20b3903206a42c6a267696ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz?=
 <lucio@lucioillanes.de>
Date: Mon, 5 Apr 2021 11:10:57 +0100
Subject: subr/pkg_fetch_{download,extract}.subr: download into & auto-cleanup
 ${BUILD_DLCACHEDIR}/${PKG_NAME}/ vs. ${BUILD_DLCACHEDIR}/.
 vars/{gcc,python[23]{,_host}}.vars: updated.

---
 vars/gcc.vars          | 32 +++++++++++++++++++++-----------
 vars/python2.vars      |  2 +-
 vars/python2_host.vars |  2 +-
 vars/python3.vars      |  2 +-
 vars/python3_host.vars |  2 +-
 5 files changed, 25 insertions(+), 15 deletions(-)

(limited to 'vars')

diff --git a/vars/gcc.vars b/vars/gcc.vars
index c7e094a9..50794c93 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -122,11 +122,16 @@ pkgp_gcc_stage1_all() {
 		return 1;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
-		rtl_fetch_urls_git							\
-			"${BUILD_DLCACHEDIR}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}"	\
-			"${PKG_NAME}" "${PKG_MIRRORS_GIT:-}"				\
-			"cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}" || return 1;
-		pkgp_gcc_state_set "fetch" -"patch";
+		if ! pkg_fetch_download_dlcache_subdir; then
+			return 1;
+		elif ! rtl_fetch_urls_git									\
+				"${BUILD_DLCACHEDIR}/${PKG_NAME}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}"	\
+				"${PKG_NAME}" "${PKG_MIRRORS_GIT:-}"						\
+				"cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; then
+			return 1;
+		else
+			pkgp_gcc_state_set "fetch" -"patch";
+		fi;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
 		if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
@@ -213,12 +218,17 @@ pkg_gcc_full_all() {
 	export MAKE="make LIBTOOL=slibtool ${_vis_hide}";
 	pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native;
 	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
-		rtl_fetch_urls_git					\
-			"${BUILD_DLCACHEDIR}" "${DEFAULT_GIT_ARGS}"	\
-			"${PKG_BASE_DIR}" "${PKG_NAME}"			\
-			"${PKG_MIRRORS_GIT:-}"				\
-			"cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}" || return 1;
-		pkgp_gcc_state_set "fetch" -"patch";
+		if ! pkg_fetch_download_dlcache_subdir; then
+			return 1;
+		elif ! rtl_fetch_urls_git						\
+				"${BUILD_DLCACHEDIR}/${PKG_NAME}" "${DEFAULT_GIT_ARGS}"	\
+				"${PKG_BASE_DIR}" "${PKG_NAME}"				\
+				"${PKG_MIRRORS_GIT:-}"					\
+				"cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}"; then
+			return 1;
+		else
+			pkgp_gcc_state_set "fetch" -"patch";
+		fi;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
 		if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
diff --git a/vars/python2.vars b/vars/python2.vars
index 7bdcd205..67a39d09 100644
--- a/vars/python2.vars
+++ b/vars/python2.vars
@@ -5,7 +5,7 @@
 pkg_python2_fetch_download() {
 	if ! pkg_fetch_download\
 	|| ! rtl_fileop rm "${PKG_BASE_DIR}/sbpython2"\
-	|| ! rtl_fetch_urls_git "${BUILD_DLCACHEDIR}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}/build" "${PKG_NAME}" "${PKG_MIRRORS_GIT:-}" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"\
+	|| ! rtl_fetch_urls_git "${BUILD_DLCACHEDIR}/${PKG_NAME}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}/build" "${PKG_NAME}" "${PKG_MIRRORS_GIT:-}" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"\
 	|| ! ex_pkg_state_set "${PKG_NAME}" "fetch_download" "-fetch_extract"; then
 		return 1;
 	fi;
diff --git a/vars/python2_host.vars b/vars/python2_host.vars
index 0cb83e2a..8222aac9 100644
--- a/vars/python2_host.vars
+++ b/vars/python2_host.vars
@@ -5,7 +5,7 @@
 pkg_python2_host_fetch_download() {
 	if ! pkg_fetch_download\
 	|| ! rtl_fileop rm "${PKG_BASE_DIR}/sbpython2"\
-	|| ! rtl_fetch_urls_git "${BUILD_DLCACHEDIR}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}/build" "${PKG_NAME}" "${PKG_MIRRORS_GIT:-}" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"\
+	|| ! rtl_fetch_urls_git "${BUILD_DLCACHEDIR}/${PKG_NAME}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}/build" "${PKG_NAME}" "${PKG_MIRRORS_GIT:-}" "sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"\
 	|| ! rtl_fileop cp "../sbpython2/project/config/cfgdefs.sh" "../sbpython2/project/config/cfgdefs.sh.orig"\
 	|| ! sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']*\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython2/project/config/cfgdefs.sh\
 	|| ! sed -i"" -e'108a\
diff --git a/vars/python3.vars b/vars/python3.vars
index a58325c1..3e3bd32f 100644
--- a/vars/python3.vars
+++ b/vars/python3.vars
@@ -5,7 +5,7 @@
 pkg_python3_fetch_download() {
 	if ! pkg_fetch_download\
 	|| ! rtl_fileop rm "${PKG_BASE_DIR}/sbpython3"\
-	|| ! rtl_fetch_urls_git "${BUILD_DLCACHEDIR}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}/build" "${PKG_NAME}" "${PKG_MIRRORS_GIT:-}" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main"\
+	|| ! rtl_fetch_urls_git "${BUILD_DLCACHEDIR}/${PKG_NAME}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}/build" "${PKG_NAME}" "${PKG_MIRRORS_GIT:-}" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main"\
 	|| ! ex_pkg_state_set "${PKG_NAME}" "fetch_download" "-fetch_extract"; then
 		return 1;
 	fi;
diff --git a/vars/python3_host.vars b/vars/python3_host.vars
index 05b58e2b..df70b7be 100644
--- a/vars/python3_host.vars
+++ b/vars/python3_host.vars
@@ -5,7 +5,7 @@
 pkg_python3_host_fetch_download() {
 	if ! pkg_fetch_download\
 	|| ! rtl_fileop rm "${PKG_BASE_DIR}/sbpython3"\
-	|| ! rtl_fetch_urls_git "${BUILD_DLCACHEDIR}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}/build" "${PKG_NAME}" "${PKG_MIRRORS_GIT:-}" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main"\
+	|| ! rtl_fetch_urls_git "${BUILD_DLCACHEDIR}/${PKG_NAME}" "${DEFAULT_GIT_ARGS}" "${PKG_BASE_DIR}/build" "${PKG_NAME}" "${PKG_MIRRORS_GIT:-}" "sbpython3=${DEFAULT_GITROOT}/python/sbpython3@main"\
 	|| ! rtl_fileop cp "../sbpython3/project/config/cfgdefs.sh" "../sbpython3/project/config/cfgdefs.sh.orig"\
 	|| ! sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']*\)'/mb_ncurses_libs='\1 -ltinfow'/" "../sbpython3/project/config/cfgdefs.sh"\
 	|| ! sed -i"" -e'108a\
-- 
cgit v1.2.3