From 1156ecbcde96c6189eac17d8c4bf953b4528ed36 Mon Sep 17 00:00:00 2001 From: Lucio Andrés Illanes Albornoz (arab, vxp) Date: Dec 05 2017 19:14:50 +0000 Subject: vars/build.vars, etc/build.usage: folds native_packages_* to reduce build time. --- diff --git a/etc/build.usage b/etc/build.usage index e97aa69..e28a5b6 100644 --- a/etc/build.usage +++ b/etc/build.usage @@ -31,8 +31,7 @@ usage: ./build.sh [-4|6] [-a nt32|nt64] [-b debug|release] host or host_tools, host_toolchain_deps, host_toolchain, host_toolchain_mingw32, native or native_tools, native_toolchain_deps, native_toolchain, native_toolchain_mingw32, native_runtime, packages_deps or host_packages_deps, native_packages_deps, native_packages_deps_x11, - packages or native_packages_cmdline, native_packages_dev, native_packages_etc, native_packages_inet, - or dist, dist_minipix, or dist_target. + packages or native_packages, or dist, dist_minipix, or dist_target. ${HOME}/midipix_build.vars will be sourced if present. diff --git a/vars/build.vars b/vars/build.vars index f4e2fe2..0ffcbfc 100644 --- a/vars/build.vars +++ b/vars/build.vars @@ -637,17 +637,10 @@ diffutils patch patchutils gzip tar dos2unix nano vim"; DEV_PACKAGES_PREFIX="${NATIVE_PACKAGES_DEPS_PREFIX}"; # -# Build target native_packages_cmdline -# -NATIVE_PACKAGES_CMDLINE_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_CMDLINE_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; -NATIVE_PACKAGES_CMDLINE_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_CMDLINE_MAKEFLAGS_INSTALL="PREFIX= prefix="; +# Packages list native_packages_cmdline 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}; : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz}; @@ -736,16 +729,9 @@ NATIVE_PACKAGES_CMDLINE_PREFIX="${PREFIX_NATIVE}"; : ${PKG_ZSH_URL:=https://ftp.osuosl.org/pub/blfs/conglomeration/zsh/zsh-${PKG_ZSH_VERSION}.tar.xz}; # -# Build target native_packages_dev -# -NATIVE_PACKAGES_DEV_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_DEV_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; -NATIVE_PACKAGES_DEV_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_DEV_MAKEFLAGS_INSTALL="PREFIX= prefix="; +# Packages list native_packages_dev 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}; : ${PKG_BISON_VERSION:=3.0.4}; @@ -818,19 +804,12 @@ NATIVE_PACKAGES_DEV_PREFIX="${PREFIX_NATIVE}"; : ${PKG_SMALLBASIC_IN_TREE:=1}; # -# Build target native_packages_etc -# -NATIVE_PACKAGES_ETC_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_ETC_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; -NATIVE_PACKAGES_ETC_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_ETC_MAKEFLAGS_INSTALL="PREFIX= prefix="; +# Packages list native_packages_etc 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__"}; +: ${PKG_CRON_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${NATIVE_PACKAGES_CFLAGS_CONFIGURE} -D__GNU__"}; : ${PKG_CRON_IN_TREE:=1}; : ${PKG_HEXCURSE_URLS_GIT:="hexcurse=https://github.com/LonnyGomes/hexcurse@master"}; : ${PKG_HEXCURSE_CFLAGS_CONFIGURE_EXTRA:=-I${PREFIX_NATIVE}/include/ncursesw}; @@ -915,17 +894,10 @@ NATIVE_PACKAGES_ETC_PREFIX="${PREFIX_NATIVE}"; : ${PKG_XWD_URL:=https://www.x.org/releases/individual/app/xwd-${PKG_XWD_VERSION}.tar.bz2}; # -# Build target native_packages_inet -# -NATIVE_PACKAGES_INET_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_INET_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; -NATIVE_PACKAGES_INET_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; -NATIVE_PACKAGES_INET_MAKEFLAGS_INSTALL="PREFIX= prefix="; +# Packages list native_packages_inet 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}; : ${PKG_APK_TOOLS_URL:=http://git.alpinelinux.org/cgit/apk-tools/snapshot/apk-tools-${PKG_APK_TOOLS_VERSION}.tar.bz2}; @@ -1037,6 +1009,21 @@ NATIVE_PACKAGES_INET_PREFIX="${PREFIX_NATIVE}"; : ${PKG_WHOIS_SUBDIR:=whois-${PKG_WHOIS_VERSION}}; # +# Build target native_packages +# +NATIVE_PACKAGES_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; +NATIVE_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}"; +NATIVE_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}"; +NATIVE_PACKAGES_MAKEFLAGS_INSTALL="PREFIX= prefix="; +NATIVE_PACKAGES_PACKAGES=" +${NATIVE_PACKAGES_CMDLINE_PACKAGES} +${NATIVE_PACKAGES_DEV_PACKAGES} +${NATIVE_PACKAGES_ETC_PACKAGES} +${NATIVE_PACKAGES_INET_PACKAGES}"; +NATIVE_PACKAGES_PARALLELISE=1; +NATIVE_PACKAGES_PREFIX="${PREFIX_NATIVE}"; + +# # Build target dist_minipix # DIST_MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"; @@ -1108,7 +1095,7 @@ DIST_TARGET="dist_minipix dist_target"; HOST_TARGET="host_tools host_toolchain_deps host_toolchain host_toolchain_mingw32"; NATIVE_TARGET="native_tools native_toolchain_deps native_toolchain native_toolchain_mingw32 native_runtime"; PACKAGES_DEPS_TARGET="host_packages_deps native_packages_deps native_packages_deps_x11"; -PACKAGES_TARGET="native_packages_cmdline native_packages_dev native_packages_etc native_packages_inet"; +PACKAGES_TARGET="native_packages"; # # Build meta-targets