summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-12-14 17:14:31 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2017-12-14 17:14:31 +0000
commit4cc1cf9115965443ee644328852c576ac8514193 (patch)
treea85763c9de34b8c1db533336c8c80d52f2ef429e
parent5ee83193a6a514332abfdd93808e3003683572c9 (diff)
downloadmidipix_build-4cc1cf9115965443ee644328852c576ac8514193.tar.bz2
midipix_build-4cc1cf9115965443ee644328852c576ac8514193.tar.xz
vars/build.vars:apr{,_util}: explicitly mark dependency.
subr/pkg_clean.subr: defer cleaning packages w/ dependencies. vars/env.vars:${DEFAULT_BUILD_VARS}: adds DEPS_{BASE,PARENT}.
-rw-r--r--subr/pkg_clean.subr3
-rw-r--r--vars/build.vars2
-rw-r--r--vars/env.vars28
3 files changed, 19 insertions, 14 deletions
diff --git a/subr/pkg_clean.subr b/subr/pkg_clean.subr
index c9e16e1e..b2bb8eea 100644
--- a/subr/pkg_clean.subr
+++ b/subr/pkg_clean.subr
@@ -4,6 +4,9 @@
pkg_clean() {
local _dir;
+ if [ -n "${PKG_DEPS_BASE}" ]; then
+ return 0;
+ fi;
for _dir in ${ARG_CLEAN_BUILDS}; do
case "${_dir}" in
build) ex_rtl_fileop rm "${PKG_BUILD_DIR}"; ;;
diff --git a/vars/build.vars b/vars/build.vars
index 157f9c6a..3dbda273 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -345,10 +345,12 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
: ${PKG_APR_SHA256SUM:=131f06d16d7aabd097fa992a33eec2b6af3962f93e6d570a9bd4d85e95993172};
: ${PKG_APR_VERSION:=1.6.3};
: ${PKG_APR_URL:=http://mirror.yannic-bonenberger.com/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
+: ${PKG_APR_DEPS_BASE:=apr_util};
: ${PKG_APR_UTIL_SHA256SUM:=d3e12f7b6ad12687572a3a39475545a072608f4ba03a6ce8a3778f607dd0035b};
: ${PKG_APR_UTIL_VERSION:=1.6.1};
: ${PKG_APR_UTIL_URL:=http://apache.lauf-forum.at/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
: ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
+: ${PKG_APR_UTIL_DEPS_PARENT:=apr};
: ${PKG_APR_UTIL_INSTALL_FILES:=apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
: ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd};
: ${PKG_BZIP2_VERSION:=1.0.6};
diff --git a/vars/env.vars b/vars/env.vars
index dd2dca0a..a53858d3 100644
--- a/vars/env.vars
+++ b/vars/env.vars
@@ -1,20 +1,20 @@
DEFAULT_BUILD_STEPS="
- fetch_wget fetch_git fetch_extract fetch \
- configure_patch_pre configure_autotools configure_patch configure \
- build \
- install_subdirs install_make install_files install_libs \
+ fetch_wget fetch_git fetch_extract fetch \
+ configure_patch_pre configure_autotools configure_patch configure \
+ build \
+ install_subdirs install_make install_files install_libs \
install_pkgconfig install_purge_la install_strip install clean";
DEFAULT_BUILD_VARS="
- AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC \
- CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA \
- CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIGURE \
- CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA \
- DISABLED ENV_VARS_EXTRA FNAME INHERIT_FROM INSTALL_FILES INSTALL_FILES \
- DESTDIR INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET \
- INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \
- LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \
- MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA \
- NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON PARALLELISE PATCHES_EXTRA PKG_CONFIG \
+ AR BASE_DIR BUILD_DIR BUILD_STEPS_DISABLE BUILD_TYPE CC \
+ CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA \
+ CFLAGS_INSTALL_EXTRA CONFIG_CACHE CONFIG_CACHE_EXTRA CONFIGURE \
+ CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA CXX CXXFLAGS_CONFIGURE_EXTRA DEPS_BASE \
+ DEPS_PARENT DISABLED ENV_VARS_EXTRA FNAME INHERIT_FROM INSTALL_FILES INSTALL_FILES \
+ DESTDIR INSTALL_FILES_DESTDIR INSTALL_FILES_DESTDIR_EXTRA INSTALL_TARGET \
+ INSTALL_TARGET_EXTRA IN_TREE LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE \
+ LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBTOOL MAKE MAKE_INSTALL_VNAME \
+ MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA \
+ NO_CLEAN_BASE_DIR NO_LOG_VARS PYTHON PARALLELISE PATCHES_EXTRA PKG_CONFIG \
PKG_CONFIG_LIBDIR PKGCONFIG PREFIX RANLIB SHA256SUM SUBDIR TARGET URL
URL_TYPE URLS_GIT VERSION";
DEFAULT_LOG_MSG_FAIL_COLOUR=91;