From d5afb4ad3d60f078e64e402e403f0e55fc711714 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, 6 Feb 2017 02:49:26 +0100 Subject: build.sh, {subr,vars}/*: general cleanup. --- vars/musl.vars | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'vars/musl.vars') diff --git a/vars/musl.vars b/vars/musl.vars index 5ba6e793..d5c88aac 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -4,9 +4,9 @@ # pkgp_musl_configure() { - build_fileop rm "${PKG_BUILD_DIR}"; - build_fileop mkdir "${PKG_BUILD_DIR}"; - build_fileop cd "${PKG_BUILD_DIR}"; + build_fileop rm "${WORKDIR}/${PKG_BUILD_DIR}"; + build_fileop mkdir "${WORKDIR}/${PKG_BUILD_DIR}"; + build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; env lz_cflags_cmdline="" \ lz_debug="yes" \ ../lazy/lazy \ @@ -31,15 +31,15 @@ pkg_musl_no_complex_all() { 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_MUSL_NO_COMPLEX_SHA256SUM}"; - build_fileop rm mmglue; + build_fileop rm "${WORKDIR}/mmglue"; pkg_fetch -git "mmglue=${GITROOT}/mmglue"; set_build_script_done "${PKG_NAME}" fetch -extract; fi; if ! is_build_script_done "${PKG_NAME}" extract "${_restart_at}"; then build_fileop rm "musl-${PKG_MUSL_VERSION}"; - tar -xf "${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz"; + tar -C "${WORKDIR}" -xf "${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz"; set +o noglob; - build_fileop cp mmglue/* "musl-${PKG_MUSL_VERSION}/"; + build_fileop cp ${WORKDIR}/mmglue/* "${WORKDIR}/musl-${PKG_MUSL_VERSION}/"; set -o noglob; set_build_script_done "${PKG_NAME}" extract -configure; fi; -- cgit v1.2.3