diff options
| author | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-04-05 11:10:57 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz <lucio@lucioillanes.de> | 2021-04-05 11:10:57 +0100 |
| commit | 10ff54eb9e65ad8b20b3903206a42c6a267696ab (patch) | |
| tree | 56cb29023d679d6ca034eea69cb37d544e9cae1a /vars/gcc.vars | |
| parent | 64409f500604636c649603c4f54339a957fc3aed (diff) | |
| download | midipix_build-10ff54eb9e65ad8b20b3903206a42c6a267696ab.tar.bz2 midipix_build-10ff54eb9e65ad8b20b3903206a42c6a267696ab.tar.xz | |
subr/pkg_fetch_{download,extract}.subr: download into & auto-cleanup ${BUILD_DLCACHEDIR}/${PKG_NAME}/ vs. ${BUILD_DLCACHEDIR}/.
vars/{gcc,python[23]{,_host}}.vars: updated.
Diffstat (limited to 'vars/gcc.vars')
| -rw-r--r-- | vars/gcc.vars | 32 |
1 files changed, 21 insertions, 11 deletions
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 |