From 03a6372afeb96419da89a8100c95366f9ebe68cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?= =?UTF-8?q?p=29?= Date: Wed, 1 Feb 2017 00:35:43 +0000 Subject: subr/{pkg,pkg_fetch}.subr: merges fetch{,_git}() into pkg_fetch.subr and introduces ${PKG_URLS_GIT}. subr/pkg_extract.subr: only extract if ${PKG_URL} is set. var/build.vars: updated to use ${PKG_URLS_GIT}. vars/{cparser,gcc,libfirm,musl,perl}.vars: updated to call pkg_fetch() instead of fetch{,_git}(). vars/gcc.vars: cleanup pkgp_gcc_setup_env() and pkg_gcc_stage1_all(). --- vars/musl.vars | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'vars/musl.vars') diff --git a/vars/musl.vars b/vars/musl.vars index bec1e06c..8d0e53bc 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -22,16 +22,16 @@ pkgp_musl_configure() { pkg_musl_no_complex_all() { PKG_MUSL_VERSION="${PKG_MUSL_NO_COMPLEX_VERSION}"; # Git clone what we need. - fetch_git lazy ${GITROOT}/lazy; + pkg_fetch -git "lazy=${GITROOT}/lazy"; export lz_arch=${ARCH} lz_cflags_debug=-O2 lz_target=${TARGET}; # Musl: build (no-complex) _install=install_no_complex; set_build_dir musl-${PKG_MUSL_VERSION}-${2} cross; if ! is_build_script_done fetch; then - fetch http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz \ + pkg_fetch http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz \ ${PKG_MUSL_NO_COMPLEX_SHA256SUM}; secure_rm mmglue; - fetch_git mmglue ${GITROOT}/mmglue; + pkg_fetch -git "mmglue=${GITROOT}/mmglue"; set_build_script_done fetch -extract; fi; if ! is_build_script_done extract; then @@ -60,7 +60,7 @@ pkg_musl_no_complex_all() { pkg_musl_native_all() { PKG_MUSL_VERSION="${PKG_MUSL_NATIVE_VERSION}"; # Git clone what we need. - fetch_git lazy ${GITROOT}/lazy; + pkg_fetch -git "lazy=${GITROOT}/lazy"; export lz_arch=${ARCH} lz_cflags_debug=-O2 lz_target=${TARGET}; # Musl: build (full) _install=install; @@ -86,7 +86,7 @@ pkg_musl_native_all() { pkg_musl_full_all() { PKG_MUSL_VERSION="${PKG_MUSL_FULL_VERSION}"; # Git clone what we need. - fetch_git lazy ${GITROOT}/lazy; + pkg_fetch -git "lazy=${GITROOT}/lazy"; export lz_arch=${ARCH} lz_cflags_debug=-O2 lz_target=${TARGET}; # Musl: build (full) _install=install; -- cgit v1.2.3