summaryrefslogtreecommitdiffhomepage
path: root/vars/build.vars
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2018-04-03 21:56:51 +0000
committerLucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>2018-04-03 22:01:22 +0000
commit6c6c71b5a6f2b3bceaf15123bbe86cb3adad1633 (patch)
tree756c5d1cb03b5f17953944b2c2619e4c56fce775 /vars/build.vars
parent860ca8c16640fcbcf6beed9596c54efa569522c8 (diff)
downloadmidipix_build-6c6c71b5a6f2b3bceaf15123bbe86cb3adad1633.tar.bz2
midipix_build-6c6c71b5a6f2b3bceaf15123bbe86cb3adad1633.tar.xz
build.sh:start_build: always build all `invariants' target packages.
build.sh:exec_start, vars/invariants_{digest,tarballs}.vars: move ${ARG_TARBALL} checks into invariants_{digest,tarballs}. etc/build.usage: update targets list. vars/build.vars:dist_minipix: renamed to `minipix'. vars/build.vars:dist: split into {dist,invariants}. vars/dist_gitref.vars: renamed to vars/invariants_gitref.vars.
Diffstat (limited to 'vars/build.vars')
-rw-r--r--vars/build.vars30
1 files changed, 18 insertions, 12 deletions
diff --git a/vars/build.vars b/vars/build.vars
index 39ed6e75..4f4047cc 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1138,18 +1138,18 @@ NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}";
NATIVE_PACKAGES_PYTHON="${PREFIX}/bin/python";
#
-# Build target dist_minipix
+# Build target minipix
#
-DIST_MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
-DIST_MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
-DIST_MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
-DIST_MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
-DIST_MINIPIX_PACKAGES="
+MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
+MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+MINIPIX_PACKAGES="
bzip2_minipix gzip_minipix xz_minipix bash_minipix coreutils_minipix
dash_minipix nano_minipix tar_minipix mintty_minipix ntctty_minipix
ptycon_minipix";
-DIST_MINIPIX_PARALLELISE=1;
-DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist";
+MINIPIX_PARALLELISE=1;
+MINIPIX_PREFIX="${PREFIX}/minipix_dist";
: ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2};
: ${PKG_BZIP2_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/bzip2-build-minipix};
: ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"};
@@ -1201,10 +1201,16 @@ DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist";
: ${PKG_PTYCON_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
#
-# Build target dist_target
+# Build target dist
#
-DIST_TARGET_NO_LOG_VARS=1;
-DIST_TARGET_PACKAGES="dist_minipix_dist dist_etc dist_digest dist_gitref dist_tarballs";
+DIST_NO_LOG_VARS=1;
+DIST_PACKAGES="dist_minipix_dist dist_etc";
+
+#
+# Build target invariants
+#
+INVARIANTS_NO_LOG_VARS=1;
+INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_tarballs";
#
# Build targets
@@ -1214,6 +1220,6 @@ host_tools host_toolchain_deps host_toolchain host_toolchain_mingw32
native_tools native_toolchain_deps native_toolchain native_toolchain_mingw32 native_runtime
host_packages_deps native_packages_deps native_packages_deps_x11
native_packages
-dist_minipix dist_target";
+minipix dist";
# vim:filetype=sh textwidth=0