From d01c0269b8e5e467f82cd28392579c4c43fe63bc 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 15:27:06 +0000 Subject: subr/pkg_{autoconf,configure,patch}.subr: reference ${PKG_BASE_DIR} instead of ${WORKDIR}. subr/pkg_build_dir.subr: {build,install} packages nested within ${PKG_BUILD_DIR}/. subr/pkg_distclean.subr: removed from repository. subr/pkg_{extract,fetch}.subr: {extract,fetch} within ${PKG_BASE_DIR}. subr/pkg_install.subr: install to ../destdir to facilitate post-installation processing. subr/pkg_setup_env.subr: set & create ${PKG_BASE_DIR}. subr/pre_subdirs.subr: always create ${PREFIX}/bin. vars/build.vars: consistently use ${PKG_{PREFIX,MAKE_INSTALL_VNAME,MAKEFLAGS_INSTALL}}. vars/env.vars, *: 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 d5c88aac..ce0110cb 100644 --- a/vars/musl.vars +++ b/vars/musl.vars @@ -4,9 +4,9 @@ # pkgp_musl_configure() { - build_fileop rm "${WORKDIR}/${PKG_BUILD_DIR}"; - build_fileop mkdir "${WORKDIR}/${PKG_BUILD_DIR}"; - build_fileop cd "${WORKDIR}/${PKG_BUILD_DIR}"; + build_fileop rm "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + build_fileop mkdir "${PKG_BASE_DIR}/${PKG_BUILD_DIR}"; + build_fileop cd "${PKG_BASE_DIR}/${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 "${WORKDIR}/mmglue"; + build_fileop rm "${PKG_BASE_DIR}/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 -C "${WORKDIR}" -xf "${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz"; + tar -C "${PKG_BASE_DIR}" -xf "${DLCACHEDIR}/musl-${PKG_MUSL_VERSION}.tar.gz"; set +o noglob; - build_fileop cp ${WORKDIR}/mmglue/* "${WORKDIR}/musl-${PKG_MUSL_VERSION}/"; + build_fileop cp ${PKG_BASE_DIR}/mmglue/* "${PKG_BASE_DIR}/musl-${PKG_MUSL_VERSION}/"; set -o noglob; set_build_script_done "${PKG_NAME}" extract -configure; fi; -- cgit v1.2.3