From c27beab66023847435fb88cd5cc75916dca37057 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: Mon, 20 Nov 2017 21:45:21 +0000 Subject: Refactors build steps along the sequence {setup,fetch,configure,build,install}. subr/mode_check_updates.subr: seperated into check_updates.sh. subr/post_{copy_etc,sha256sums,tarballs}.subr: absorbed into `dist' target. --- 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 ce0110cb..c9d21883 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -23,16 +23,16 @@ pkg_musl_no_complex_all() { local _install _restart_at="${1}"; PKG_MUSL_VERSION="${PKG_MUSL_NO_COMPLEX_VERSION}"; # Git clone what we need. - pkg_fetch -git "lazy=${GITROOT}/lazy"; + pkg_fetch_git "lazy=${DEFAULT_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}" cross; if ! is_build_script_done "${PKG_NAME}" fetch "${_restart_at}"; then - pkg_fetch "http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz" \ + pkg_fetch_wget "http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz" \ "${PKG_MUSL_NO_COMPLEX_SHA256SUM}"; build_fileop rm "${PKG_BASE_DIR}/mmglue"; - pkg_fetch -git "mmglue=${GITROOT}/mmglue"; + pkg_fetch_git "mmglue=${DEFAULT_GITROOT}/mmglue"; set_build_script_done "${PKG_NAME}" fetch -extract; fi; if ! is_build_script_done "${PKG_NAME}" extract "${_restart_at}"; then @@ -60,7 +60,7 @@ pkg_musl_native_all() { local _install _restart_at="${1}"; PKG_MUSL_VERSION="${PKG_MUSL_NATIVE_VERSION}"; # Git clone what we need. - pkg_fetch -git "lazy=${GITROOT}/lazy"; + pkg_fetch_git "lazy=${DEFAULT_GITROOT}/lazy"; export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}"; # Musl: build (full) _install=install; @@ -83,7 +83,7 @@ pkg_musl_full_all() { local _install _restart_at="${1}"; PKG_MUSL_VERSION="${PKG_MUSL_FULL_VERSION}"; # Git clone what we need. - pkg_fetch -git "lazy=${GITROOT}/lazy"; + pkg_fetch_git "lazy=${DEFAULT_GITROOT}/lazy"; export lz_arch="${ARCH}" lz_cflags_debug="-O2" lz_target="${TARGET}"; # Musl: build (full) _install=install; -- cgit v1.2.3