diff options
| author | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-05 19:08:11 +0100 |
|---|---|---|
| committer | Lucio Andrés Illanes Albornoz (arab, vxp) <l.illanes@gmx.de> | 2017-02-05 21:24:26 +0000 |
| commit | 8022154108dde14f47722bd1a18a475ef2a3f95d (patch) | |
| tree | 6215baa0f5338e3cfc7693f8bbdfaeef844744ad /vars/musl.vars | |
| parent | c1aae3835fe7d398b3e22f915fe6d7913b17ee44 (diff) | |
| download | midipix_build-8022154108dde14f47722bd1a18a475ef2a3f95d.tar.bz2 midipix_build-8022154108dde14f47722bd1a18a475ef2a3f95d.tar.xz | |
build.sh, {subr,vars}/*: general cleanup.
Diffstat (limited to 'vars/musl.vars')
| -rw-r--r-- | vars/musl.vars | 52 |
1 files changed, 23 insertions, 29 deletions
diff --git a/vars/musl.vars b/vars/musl.vars index ed7444f4..1c50fc74 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -1,5 +1,5 @@ # -# . ./build.vars and set -o errexit -o noglob are assumed. +# set -o errexit -o noglob are assumed. # Order: no_complex, native, full # @@ -20,6 +20,7 @@ pkgp_musl_configure() { }; pkg_musl_no_complex_all() { + local _install; PKG_MUSL_VERSION="${PKG_MUSL_NO_COMPLEX_VERSION}"; # Git clone what we need. pkg_fetch -git "lazy=${GITROOT}/lazy"; @@ -27,37 +28,35 @@ pkg_musl_no_complex_all() { # Musl: build (no-complex) _install=install_no_complex; set_build_dir musl-${PKG_MUSL_VERSION}-${2} cross; - if ! is_build_script_done fetch; then + if ! is_build_script_done ${PKG_NAME} fetch; then pkg_fetch http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz \ ${PKG_MUSL_NO_COMPLEX_SHA256SUM}; build_fileop rm mmglue; pkg_fetch -git "mmglue=${GITROOT}/mmglue"; - set_build_script_done fetch -extract; + set_build_script_done ${PKG_NAME} fetch -extract; fi; - if ! is_build_script_done extract; then + if ! is_build_script_done ${PKG_NAME} extract; then build_fileop rm musl-${PKG_MUSL_VERSION}; tar -xf ${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz; set +o noglob; build_fileop cp mmglue/* musl-${PKG_MUSL_VERSION}/; set -o noglob; - set_build_script_done extract -configure; + set_build_script_done ${PKG_NAME} extract -configure; fi; - if ! is_build_script_done configure; then + if ! is_build_script_done ${PKG_NAME} configure; then pkgp_musl_configure; - set_build_script_done configure clean -build; + set_build_script_done ${PKG_NAME} configure -build; else build_fileop cd ${PKG_BUILD_DIR}; fi; - if ! is_build_script_done clean; then - make ${MAKEFLAGS} clean; - set_build_script_done clean -build; - fi; - if ! is_build_script_done build; then + if ! is_build_script_done ${PKG_NAME} build; then ./lazy -e ${_install} \ -x build; - set_build_script_done build finish; + set_build_script_done ${PKG_NAME} build finish; fi; + exit 0; }; pkg_musl_native_all() { + local _install; PKG_MUSL_VERSION="${PKG_MUSL_NATIVE_VERSION}"; # Git clone what we need. pkg_fetch -git "lazy=${GITROOT}/lazy"; @@ -65,25 +64,23 @@ pkg_musl_native_all() { # Musl: build (full) _install=install; set_build_dir musl-${PKG_MUSL_VERSION} native; - if ! is_build_script_done configure; then + if ! is_build_script_done ${PKG_NAME} configure; then pkgp_musl_configure; - set_build_script_done configure clean -build; + set_build_script_done ${PKG_NAME} configure -build; else build_fileop cd ${PKG_BUILD_DIR}; fi; - if ! is_build_script_done clean; then - make ${MAKEFLAGS} clean; - set_build_script_done clean -build; - fi; - if ! is_build_script_done build; then + if ! is_build_script_done ${PKG_NAME} build; then ./lazy -e ${_install} \ -x build; build_fileop ln_symbolic ../lib/libc.so ${PKG_PREFIX}/bin/ldd; - set_build_script_done build finish; + set_build_script_done ${PKG_NAME} build finish; fi; + exit 0; }; pkg_musl_full_all() { + local _install; PKG_MUSL_VERSION="${PKG_MUSL_FULL_VERSION}"; # Git clone what we need. pkg_fetch -git "lazy=${GITROOT}/lazy"; @@ -91,21 +88,18 @@ pkg_musl_full_all() { # Musl: build (full) _install=install; set_build_dir musl-${PKG_MUSL_VERSION} cross; - if ! is_build_script_done configure; then + if ! is_build_script_done ${PKG_NAME} configure; then pkgp_musl_configure; - set_build_script_done configure clean -build; + set_build_script_done ${PKG_NAME} configure -build; else build_fileop cd ${PKG_BUILD_DIR}; fi; - if ! is_build_script_done clean; then - make ${MAKEFLAGS} clean; - set_build_script_done clean -build; - fi; - if ! is_build_script_done build; then + if ! is_build_script_done ${PKG_NAME} build; then ./lazy -e ${_install} \ -x build; - set_build_script_done build finish; + set_build_script_done ${PKG_NAME} build finish; fi; + exit 0; }; # vim:filetype=sh |