From 807f5fcd8b8d5e661986e16a271d94b165c53b59 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: Tue, 5 Dec 2017 00:47:08 +0000 Subject: vars/build.vars:{native_packages_*,dist_minipix}: enables parallelisation. vars/env.vars:${DEFAULT_BUILD_VARS}: adds ${PKG_PARALLELISE}. subr/ex_pkg_dispatch.subr: implements parallelisation. --- vars/build.vars | 5 +++++ vars/env.vars | 5 +++-- vars/midipix.vars | 2 +- 3 files changed, 9 insertions(+), 3 deletions(-) (limited to 'vars') diff --git a/vars/build.vars b/vars/build.vars index ba3a9148..f4e2fe23 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -646,6 +646,7 @@ NATIVE_PACKAGES_CMDLINE_MAKEFLAGS_INSTALL="PREFIX= prefix="; NATIVE_PACKAGES_CMDLINE_PACKAGES=" bash bc coreutils dash datamash dos2unix ed figlet file findutils gawk grep mksh sbase sed tar tcsh the_silver_searcher toilet ubase util_linux which zsh"; +NATIVE_PACKAGES_CMDLINE_PARALLELISE=1; NATIVE_PACKAGES_CMDLINE_PREFIX="${PREFIX_NATIVE}"; : ${PKG_BASH_SHA256SUM:=d86b3392c1202e8ff5a423b302e6284db7f8f435ea9f39b5b1b20fd3ac36dfcb}; : ${PKG_BASH_VERSION:=4.4}; @@ -743,6 +744,7 @@ NATIVE_PACKAGES_DEV_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; NATIVE_PACKAGES_DEV_MAKEFLAGS_INSTALL="PREFIX= prefix="; NATIVE_PACKAGES_DEV_PACKAGES=" bdwgc bison chicken cparser diffutils flex lunix m4 make man_db patch patchutils perl python3 ruby smallbasic"; +NATIVE_PACKAGES_DEV_PARALLELISE=1; NATIVE_PACKAGES_DEV_PREFIX="${PREFIX_NATIVE}"; : ${PKG_BDWGC_URLS_GIT:="bdwgc=https://github.com/ivmai/bdwgc@master"}; : ${PKG_BISON_SHA256SUM:=a72428c7917bdf9fa93cb8181c971b6e22834125848cf1d03ce10b1bb0716fe1}; @@ -825,6 +827,7 @@ NATIVE_PACKAGES_ETC_MAKEFLAGS_INSTALL="PREFIX= prefix="; NATIVE_PACKAGES_ETC_PACKAGES=" cron hexcurse htop infounzip infozip john less mc mintty nano ncdu p7zip procps_ng qpdf rxvt_unicode st tmux vim xeyes xwd"; +NATIVE_PACKAGES_ETC_PARALLELISE=1; NATIVE_PACKAGES_ETC_PREFIX="${PREFIX_NATIVE}"; : ${PKG_CRON_URLS_GIT:="pkg-cron.git=git://anonscm.debian.org/pkg-cron/pkg-cron.git@debian/3.0pl1-128"}; : ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${NATIVE_PACKAGES_ETC_CFLAGS_CONFIGURE} -D__GNU__"}; @@ -921,6 +924,7 @@ NATIVE_PACKAGES_INET_MAKEFLAGS_INSTALL="PREFIX= prefix="; NATIVE_PACKAGES_INET_PACKAGES=" apk_tools aria2 bind dropbear git gnupg httpd inetutils irssi ldns lighttpd lynx mtr nginx openlitespeed openssh pacman rsync socat thttpd weechat wget whois"; +NATIVE_PACKAGES_INET_PARALLELISE=1; NATIVE_PACKAGES_INET_PREFIX="${PREFIX_NATIVE}"; : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b}; : ${PKG_APK_TOOLS_VERSION:=2.6.8}; @@ -1042,6 +1046,7 @@ DIST_MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix="; DIST_MINIPIX_PACKAGES=" bzip2_minipix gzip_minipix xz_minipix bash_minipix coreutils_minipix nano_minipix tar_minipix mintty_minipix ntctty_minipix ptycon_minipix"; +DIST_MINIPIX_PARALLELISE=1; DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist"; : ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2}; : ${PKG_BZIP2_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/bzip2-build-minipix}; diff --git a/vars/env.vars b/vars/env.vars index 15a02751..5d2206df 100644 --- a/vars/env.vars +++ b/vars/env.vars @@ -14,8 +14,9 @@ DEFAULT_BUILD_VARS=" 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 PATCHES_EXTRA PKG_CONFIG PKG_CONFIG_LIBDIR \ - PKGCONFIG PREFIX RANLIB SHA256SUM SUBDIR TARGET URL URL_TYPE URLS_GIT VERSION"; + NO_CLEAN_BASE_DIR NO_LOG_VARS 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; DEFAULT_LOG_MSG_INFO_COLOUR=93; DEFAULT_LOG_MSG_INF2_COLOUR=33; diff --git a/vars/midipix.vars b/vars/midipix.vars index 62cff680..249a42ee 100644 --- a/vars/midipix.vars +++ b/vars/midipix.vars @@ -34,7 +34,7 @@ @.=usr"}; # Default flags & variables -: ${DEFAULT_BUILD_CPUS:=1}; +: ${DEFAULT_BUILD_CPUS:=}; : ${DEFAULT_BUILD_TYPE:=native}; : ${DEFAULT_CFLAGS_DEBUG:="-g2 -O0"}; : ${DEFAULT_CFLAGS_DEBUG_HOST:="-g0 -O2"}; -- cgit v1.2.3