summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-09 09:56:39 +0000
committerLucio Andrés Illanes Albornoz <lucio@lucioillanes.de>2020-02-09 09:56:39 +0000
commit4dc3585621c0130a542f3dfd5666433480220003 (patch)
treef3f27b3cc3c4297fdfdc083574bf35130d0b50c7
parent7c4fd9674eff8cb8e383baa160b63a8043744bf8 (diff)
downloadmidipix_build-4dc3585621c0130a542f3dfd5666433480220003.tar.bz2
midipix_build-4dc3585621c0130a542f3dfd5666433480220003.tar.xz
vars/build.vars:host_deps: split from host_tools.
vars/build.vars:host_deps:${PKG_PARALLELISE}: parallelise. vars/build.vars:host_tools_rpm:${PKG_PARALLELISE}: don't parallelise (implicitly.) etc/build.usage: updated.
-rw-r--r--etc/build.usage9
-rw-r--r--vars/build.vars50
2 files changed, 33 insertions, 26 deletions
diff --git a/etc/build.usage b/etc/build.usage
index 76df6284..3db9c2d1 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -35,10 +35,11 @@ usage: ./build.sh [-a nt32|nt64] [-b debug|release] [-C dir[,..]] [-D kind[,..]]
-v[v[v[v]]] Be verbose; -vv: always print package logs; -vvv: set xtrace during package builds; -vvvv: logs fileops.
--as-needed Don't build unless the midipix_build repository has received new commits.
--debug-minipix Don't strip(1) minipix binaries to facilitate debugging minipix.
- <target>[ ..] One of: host_packages_deps, host_toolchain, host_toolchain_deps, host_toolchain_mingw32,
- host_tools, host_tools_rpm, minipix, native_packages, native_packages_deps,
- native_packages_deps_deps, native_packages_deps_x11, native_runtime, native_toolchain,
- native_toolchain_deps, native_toolchain_mingw32, and/or native_tools.
+ <target>[ ..] One of: host_deps, host_packages_deps, host_toolchain, host_toolchain_deps,
+ host_toolchain_mingw32, host_tools, host_tools_rpm, minipix, native_packages,
+ native_packages_deps, native_packages_deps_deps, native_packages_deps_x11,
+ native_runtime, native_toolchain, native_toolchain_deps, native_toolchain_mingw32,
+ and/or native_tools.
${HOME}/midipix_build.vars, ${HOME}/.midipix_build.vars, and/or ../midipix_build.vars will be sourced if present.
diff --git a/vars/build.vars b/vars/build.vars
index 59639d5e..a3a40de6 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -149,16 +149,32 @@ gl_cv_C_locale_sans_EILSEQ=yes"};
#
HOST_TOOLS_BUILD_TYPE="host";
HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
-HOST_TOOLS_PACKAGES="
-chainport_host slibtool_host bmake_host bzip2_host file_host
-install_strip_host libz_host m4_host mdso_host mpackage_host perk_host
-pkgconf_host sqlite3_host texinfo_host";
+HOST_TOOLS_PACKAGES="slibtool_host mdso_host perk_host pkgconf_host";
HOST_TOOLS_PREFIX="${PREFIX}";
-: ${PKG_CHAINPORT_HOST_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"};
-: ${PKG_CHAINPORT_HOST_BUILD_STEPS_DISABLE:=build};
-: ${PKG_CHAINPORT_HOST_NO_LOG_VARS:=1};
: ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${DEFAULT_GITROOT}/slibtool"};
: ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--prefix=};
+: ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
+: ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix="};
+: ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
+: ${PKG_PERK_HOST_URLS_GIT:="perk=${DEFAULT_GITROOT}/perk"};
+: ${PKG_PERK_HOST_CONFIGURE_ARGS:="--prefix="};
+: ${PKG_PERK_HOST_INSTALL_FILES:="@perk=bin/${DEFAULT_TARGET}-perk"};
+: ${PKG_PERK_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
+: ${PKG_PKGCONF_HOST_SHA256SUM:=61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210};
+: ${PKG_PKGCONF_HOST_VERSION:=1.6.3};
+: ${PKG_PKGCONF_HOST_URL:=https://distfiles.dereferenced.org/pkgconf/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.xz};
+: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="--prefix=${PREFIX} --with-system-libdir=${PREFIX_NATIVE}/lib --with-system-includedir=${PREFIX_NATIVE}/include --with-pkg-config-dir=${PREFIX_NATIVE}/lib/pkgconfig --with-personality-dir=${PREFIX_NATIVE}/share/pkgconfig/personality.d"};
+: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
+
+#
+# Build target host_deps
+#
+HOST_DEPS_BUILD_TYPE="host";
+HOST_DEPS_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
+HOST_DEPS_PACKAGES="
+bmake_host bzip2_host file_host install_strip_host libz_host m4_host mpackage_host sqlite3_host texinfo_host";
+HOST_DEPS_PARALLELISE=1;
+HOST_DEPS_PREFIX="${PREFIX}";
: ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
: ${PKG_BMAKE_HOST_MAKEFLAGS_BUILD:=-j1};
: ${PKG_BZIP2_HOST_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
@@ -179,9 +195,6 @@ HOST_TOOLS_PREFIX="${PREFIX}";
: ${PKG_M4_HOST_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07};
: ${PKG_M4_HOST_VERSION:=1.4.18};
: ${PKG_M4_HOST_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_HOST_VERSION}.tar.xz};
-: ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
-: ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix="};
-: ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
: ${PKG_MPACKAGE_HOST_URLS_GIT:=mpackage=${DEFAULT_GITROOT}/mpackage};
: ${PKG_MPACKAGE_HOST_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
: ${PKG_MPACKAGE_HOST_IN_TREE:=1};
@@ -189,15 +202,6 @@ HOST_TOOLS_PREFIX="${PREFIX}";
: ${PKG_MPACKAGE_HOST_PREFIX:=${PREFIX_NATIVE}};
: ${PKG_MPACKAGE_HOST_RPM_DISABLE:=1};
: ${PKG_MPACKAGE_HOST_SRC_TARBALL_DISABLE:=1};
-: ${PKG_PERK_HOST_URLS_GIT:="perk=${DEFAULT_GITROOT}/perk"};
-: ${PKG_PERK_HOST_CONFIGURE_ARGS:="--prefix="};
-: ${PKG_PERK_HOST_INSTALL_FILES:="@perk=bin/${DEFAULT_TARGET}-perk"};
-: ${PKG_PERK_HOST_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
-: ${PKG_PKGCONF_HOST_SHA256SUM:=61f0b31b0d5ea0e862b454a80c170f57bad47879c0c42bd8de89200ff62ea210};
-: ${PKG_PKGCONF_HOST_VERSION:=1.6.3};
-: ${PKG_PKGCONF_HOST_URL:=https://distfiles.dereferenced.org/pkgconf/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.xz};
-: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="--prefix=${PREFIX} --with-system-libdir=${PREFIX_NATIVE}/lib --with-system-includedir=${PREFIX_NATIVE}/include --with-pkg-config-dir=${PREFIX_NATIVE}/lib/pkgconfig --with-personality-dir=${PREFIX_NATIVE}/share/pkgconfig/personality.d"};
-: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
: ${PKG_SQLITE3_HOST_SHA256SUM:=65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615};
: ${PKG_SQLITE3_HOST_VERSION:=3160200};
: ${PKG_SQLITE3_HOST_URL:=https://sqlite.org/2017/sqlite-autoconf-${PKG_SQLITE3_HOST_VERSION}.tar.gz};
@@ -214,7 +218,6 @@ HOST_TOOLS_RPM_BUILD_TYPE="host";
HOST_TOOLS_RPM_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}";
HOST_TOOLS_RPM_MAKEFLAGS_INSTALL_EXTRA="prefix=";
HOST_TOOLS_RPM_PACKAGES="libressl_host libarchive_host lmdb_host popt_host rpm_host";
-HOST_TOOLS_RPM_PARALLELISE=0;
HOST_TOOLS_RPM_PREFIX="${PREFIX}";
: ${PKG_LIBRESSL_HOST_SHA256SUM:=df7b172bf79b957dd27ef36dcaa1fb162562c0e8999e194aa8c1a3df2f15398e};
: ${PKG_LIBRESSL_HOST_VERSION:=3.0.2};
@@ -241,8 +244,11 @@ HOST_TOOLS_RPM_PREFIX="${PREFIX}";
HOST_TOOLCHAIN_DEPS_BUILD_TYPE="host";
HOST_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=";
HOST_TOOLCHAIN_DEPS_PACKAGES="
-gmp_host mpfr_host mpc_host psxtypes_host";
+chainport_host gmp_host mpfr_host mpc_host psxtypes_host";
HOST_TOOLCHAIN_DEPS_PREFIX="${PREFIX}";
+: ${PKG_CHAINPORT_HOST_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"};
+: ${PKG_CHAINPORT_HOST_BUILD_STEPS_DISABLE:=build};
+: ${PKG_CHAINPORT_HOST_NO_LOG_VARS:=1};
: ${PKG_GMP_HOST_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2};
: ${PKG_GMP_HOST_VERSION:=6.1.2};
: ${PKG_GMP_HOST_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_HOST_VERSION}.tar.bz2};
@@ -2031,7 +2037,7 @@ INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_minipix inva
# Build targets
#
TARGETS_DEFAULT="
-host_tools host_tools_rpm host_toolchain_deps host_toolchain host_toolchain_mingw32
+host_tools host_deps host_tools_rpm 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_deps native_packages_deps native_packages_deps_x11
native_packages