summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2022-12-26 17:12:32 +0100
committerLucía Andrea Illanes Albornoz <lucia@luciaillanes.de>2022-12-26 17:12:32 +0100
commit8953f4bbaa015049fcc8bb753b2bc8056f51535c (patch)
treefb178c5c168ef363b29083bcfdbba221b3a5aa01
parentbaf02b1511351695ab7d2ad959964e286cc5a56b (diff)
downloadmidipix_build-8953f4bbaa015049fcc8bb753b2bc8056f51535c.tar.bz2
midipix_build-8953f4bbaa015049fcc8bb753b2bc8056f51535c.tar.xz
groups/010.host_deps.group:mpackage_host:${PKG_NO_CLEAN_BUILD_DIR}: don't clean build directory. (via imfatf1sh)
midipix.env:${DEFAULT_BUILD_VARS}: adds NO_CLEAN_BUILD_DIR. subr/pkg_clean.subr: don't clean build directory unless ${PKG_NO_CLEAN_BUILD_DIR} -eq 0.
-rw-r--r--groups/010.host_deps.group1
-rw-r--r--midipix.env2
-rw-r--r--subr/pkg_clean.subr3
3 files changed, 4 insertions, 2 deletions
diff --git a/groups/010.host_deps.group b/groups/010.host_deps.group
index 29f7b9a6..90bdb9ed 100644
--- a/groups/010.host_deps.group
+++ b/groups/010.host_deps.group
@@ -194,6 +194,7 @@ HOST_DEPS_TOOLS_RPM_DISABLE=1;
: ${PKG_MPACKAGE_HOST_URLS_GIT:=mpackage=${DEFAULT_GITROOT}/mpackage};
: ${PKG_MPACKAGE_HOST_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
: ${PKG_MPACKAGE_HOST_IN_TREE:=1};
+: ${PKG_MPACKAGE_HOST_NO_CLEAN_BUILD_DIR:=1};
: ${PKG_MPACKAGE_HOST_PKGLIST_DISABLE:=1};
: ${PKG_MPACKAGE_HOST_PREFIX:=${PREFIX_NATIVE}};
: ${PKG_MPACKAGE_HOST_RPM_DISABLE:=1};
diff --git a/midipix.env b/midipix.env
index a146b301..dfb6ddf4 100644
--- a/midipix.env
+++ b/midipix.env
@@ -30,7 +30,7 @@ DEFAULT_BUILD_VARS=" \
LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LIBTOOL MAKE MAKEFLAGS_BUILD \
MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA \
MAKEFLAGS_VERBOSITY MAKE_INSTALL_VNAME MAKE_SUBDIRS MIRRORS MIRRORS_GIT \
- NO_CLEAN NO_CLEAN_BASE_DIR NO_LOG_VARS PATCHES_EXTRA PKG_CONFIG \
+ NO_CLEAN NO_CLEAN_BASE_DIR NO_CLEAN_BUILD_DIR NO_LOG_VARS PATCHES_EXTRA PKG_CONFIG \
PKG_CONFIG_LIBDIR PKGLIST_DISABLE PREFIX PYTHON RANLIB RPM_DISABLE \
SHA256SUM SOFORT_NATIVE_CC SOFORT_NATIVE_CFLAGS SOFORT_NATIVE_CFLAGS_EXTRA \
SOFORT_NATIVE_CXX SOFORT_NATIVE_CXXFLAGS SOFORT_NATIVE_CXXFLAGS_EXTRA \
diff --git a/subr/pkg_clean.subr b/subr/pkg_clean.subr
index a4a70d63..e8f1899d 100644
--- a/subr/pkg_clean.subr
+++ b/subr/pkg_clean.subr
@@ -4,7 +4,8 @@
pkg_clean() {
if [ "${PKG_NO_CLEAN:-0}" -eq 0 ]; then
- if rtl_lmatch "${ARG_CLEAN_BUILDS}" "build" ","; then
+ if rtl_lmatch "${ARG_CLEAN_BUILDS}" "build" ","\
+ && [ "${PKG_NO_CLEAN_BUILD_DIR:-0}" -eq 0 ]; then
if ! rtl_fileop rm "${PKG_BUILD_DIR}"; then
return 1;
fi;