build.sh, etc/build.usage: adds --debug-minipix: override default behaviour of strip(1)ping minipix/bin/*.

subr/post_strip.subr: strip(1) minipix/bin/* unless --debug-minipix was specified (via midipix.)
vars/build.vars: adds `minipix' target individually and as part of `world' encompassing all minipix-flavoured packages.

1 files changed, 57 insertions, 45 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 4d717225..f080e866 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -21,12 +21,14 @@ if [ "${BUILD:=debug}" = debug ]; then
 	RUNTIME_CFLAGS_CONFIGURE_DEFAULT="-g3 -O0";
 	LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 	LEAF_PACKAGES_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
+	MINIPIX_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 elif [ "${BUILD}" = release ]; then
 	HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	RUNTIME_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	LEAF_PACKAGES_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
+	MINIPIX_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 else
 	log_msg failexit "Error: unknown build type \`${BUILD}'.";
 fi;
@@ -53,7 +55,7 @@ fi;
 : ${DEFAULT_MAKEFLAGS_BUILD:=-j${BUILD_CPUS:=1}};
 : ${GITROOT:=git://midipix.org};
 : ${GITROOT_HEAD:=git://midipix.org};
-: ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT ARCH BUILD HOST_TOOLCHAIN_CFLAGS_CONFIGURE NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE RUNTIME_CFLAGS_CONFIGURE LIB_PACKAGES_CFLAGS_CONFIGURE LEAF_PACKAGES_CFLAGS_CONFIGURE PREFIX PREFIX_NATIVE PREFIX_CROSS WORKDIR"};
+: ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT ARCH BUILD HOST_TOOLCHAIN_CFLAGS_CONFIGURE NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE RUNTIME_CFLAGS_CONFIGURE LIB_PACKAGES_CFLAGS_CONFIGURE LEAF_PACKAGES_CFLAGS_CONFIGURE MINIPIX_CFLAGS_CONFIGURE PREFIX PREFIX_NATIVE PREFIX_CROSS WORKDIR"};
 : ${LOG_MSG_FAIL_COLOUR:=91};
 : ${LOG_MSG_INFO_COLOUR:=93};
 : ${LOG_MSG_SUCC_COLOUR:=92};
@@ -207,7 +209,7 @@ RUNTIME_CFLAGS_CONFIGURE="${RUNTIME_CFLAGS_CONFIGURE_DEFAULT}";
 RUNTIME_CONFIGURE_ARGS="--prefix= --strict --host=${TARGET}";
 RUNTIME_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib";
 RUNTIME_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
-RUNTIME_PACKAGES="psxtypes pemagine dalist ntcon ntapi psxscl psxscl_strace ntctty ntctty_flavour_minipix ptycon ptycon_flavour_minipix";
+RUNTIME_PACKAGES="psxtypes pemagine dalist ntcon ntapi psxscl psxscl_strace ntctty ptycon";
 RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${GITROOT}/psxtypes};
 : ${PKG_PSXTYPES_BUILD_DIR:=psxtypes};
@@ -238,16 +240,10 @@ RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_NTCTTY_URLS_GIT:=ntctty=${GITROOT_HEAD}/ntctty};
 : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_NTCTTY_SUBDIR:=ntctty};
-: ${PKG_NTCTTY_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
-: ${PKG_NTCTTY_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}"};
-: ${PKG_NTCTTY_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
 : ${PKG_PTYCON_URLS_GIT:=ptycon=${GITROOT_HEAD}/ptycon};
 : ${PKG_PTYCON_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PTYCON_INSTALL_TARGET_EXTRA:="install-app install-lib"};
 : ${PKG_PTYCON_SUBDIR:=ptycon};
-: ${PKG_PTYCON_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
-: ${PKG_PTYCON_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}"};
-: ${PKG_PTYCON_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
 
 #
 # Build target lib_packages
@@ -257,10 +253,9 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe
 LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LIB_PACKAGES_PACKAGES_LEAVES="
-apr apr_util bzip2 bzip2_flavour_minipix curl expat libz libffi gdbm geoip pcre glib gzip
-gzip_flavour_minipix libarchive libatomic_ops libpipeline libressl libevent libfetch libgpg_error
-libassuan libfirm libgcrypt libksba libxml2 lua ncurses ncursestw ncursesw npth sqlite3 xz
-xz_flavour_minipix";
+apr apr_util bzip2 curl expat libz libffi gdbm geoip pcre glib gzip libarchive libatomic_ops
+libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt libksba libxml2
+lua ncurses ncursestw ncursesw npth sqlite3 xz";
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext libICE libSM libXt libXmu renderproto Xrender libXpm libXaw libxkbfile";
@@ -289,11 +284,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
 : ${PKG_BZIP2_MAKEFLAGS_INSTALL_EXTRA:=PREFIX=${PREFIX_NATIVE}};
 : ${PKG_BZIP2_NO_CLEAN:=1};
-: ${PKG_BZIP2_FLAVOUR_MINIPIX_INSTALL_FILES:="bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"};
-: ${PKG_BZIP2_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
-: ${PKG_BZIP2_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"};
-: ${PKG_BZIP2_FLAVOUR_MINIPIX_NO_MAKE_INSTALL:=1};
-: ${PKG_BZIP2_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
 : ${PKG_CURL_SHA256SUM:=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde};
 : ${PKG_CURL_VERSION:=7.51.0};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.bz2};
@@ -332,11 +322,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GZIP_CONFIGURE_ARGS:=--host=${TARGET} --prefix= --target=${TARGET}};
 : ${PKG_GZIP_MAKEFLAGS_BUILD_EXTRA:=OBJA= prefix=};
 : ${PKG_GZIP_MAKEFLAGS_INSTALL_EXTRA:=OBJA= prefix=};
-: ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
-: ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_INSTALL_EXTRA:="-static"};
-: ${PKG_GZIP_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX} OBJA= prefix="};
-: ${PKG_GZIP_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
-: ${PKG_GZIP_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
 : ${PKG_CURL_SHA256SUM:=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde};
 : ${PKG_LIBARCHIVE_SHA256SUM:=691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f};
 : ${PKG_LIBARCHIVE_VERSION:=3.2.2};
@@ -423,9 +408,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_XZ_SHA256SUM:=73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2};
 : ${PKG_XZ_VERSION:=5.2.2};
 : ${PKG_XZ_URL:=https://github.com/xz-mirror/xz/releases/download/v${PKG_XZ_VERSION}/xz-${PKG_XZ_VERSION}.tar.gz};
-: ${PKG_XZ_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD:="LIBTOOLFLAGS=-all-static"};
-: ${PKG_XZ_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}"};
-: ${PKG_XZ_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
 
 : ${PKG_INPUTPROTO_SHA256SUM:=893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d};
 : ${PKG_INPUTPROTO_VERSION:=2.3.2};
@@ -511,11 +493,11 @@ LEAF_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targ
 LEAF_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LEAF_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LEAF_PACKAGES_PACKAGES="
-apk_tools bash bash_flavour_minipix bc bdwgc bind bison chicken clang_host coreutils coreutils_flavour_minipix
-cparser cron dash datamash diffutils dos2unix ed figlet file findutils gawk git gnupg grep hexcurse htop
-inetutils infounzip infozip irssi john ldns less lighttpd lynx make man_db mc mksh mtr nano netcat nginx
-openlitespeed openssh p7zip pacman patch perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic socat
-tar tar_flavour_minipix tcsh the_silver_searcher tmux util_linux vim weechat wget which whois xeyes xwd zsh";
+apk_tools bash bc bdwgc bind bison chicken clang_host coreutils cparser cron dash datamash diffutils
+dos2unix ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip irssi
+john ldns less lighttpd lynx make man_db mc mksh mtr nano netcat nginx openlitespeed openssh p7zip
+pacman patch perl procps_ng python3 qpdf rsync rxvt_unicode sed smallbasic socat tar tcsh the_silver_searcher
+tmux util_linux vim weechat wget which whois xeyes xwd zsh";
 LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_APK_TOOLS_SHA256SUM:=def2b2c23cd12fd2a9c19be49653b0d1bf9d81a26dac5a0ee79a1351d674f93b};
 : ${PKG_APK_TOOLS_VERSION:=2.6.8};
@@ -527,10 +509,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_BASH_VERSION:=4.4-rc2};
 : ${PKG_BASH_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
 : ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"};
-: ${PKG_BASH_FLAVOUR_MINIPIX_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"};
-: ${PKG_BASH_FLAVOUR_MINIPIX_NO_MAKE_INSTALL:=1};
-: ${PKG_BASH_FLAVOUR_MINIPIX_INSTALL_FILES:="bash=bin/ bashbug=bin/"};
-: ${PKG_BASH_FLAVOUR_MINIPIX_PREFIX=${PREFIX_MINIPIX}};
 : ${PKG_BC_SHA256SUM:=7ee4abbcfac03d8a6e1a8a3440558a3d239d6b858585063e745c760957725ecc};
 : ${PKG_BC_VERSION:=1.06.95};
 : ${PKG_BC_URL:=http://alpha.gnu.org/gnu/bc/bc-${PKG_BC_VERSION}.tar.bz2};
@@ -562,11 +540,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_COREUTILS_VERSION:=8.26};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
 : ${PKG_COREUTILS_MAKEFLAGS_BUILD_EXTRA:=V=99};
-: ${PKG_COREUTILS_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
-: ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"};
-: ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}"};
-: ${PKG_COREUTILS_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
-: ${PKG_COREUTILS_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
 : ${PKG_CPARSER_URLS_GIT:="cparser=http://pp.info.uni-karlsruhe.de/git/cparser.git@master bcparser=${GITROOT}/compilers/bcparser@main"};
 : ${PKG_CPARSER_BUILD_DIR:=cparser+libfirm/build/cparser};
 : ${PKG_CPARSER_CONFIGURE:=bcparser/configure};
@@ -814,10 +787,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_TAR_SHA256SUM:=cae466e6e58c7292355e7080248f244db3a4cf755f33f4fa25ca7f9a7ed09af0};
 : ${PKG_TAR_VERSION:=1.29};
 : ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz};
-: ${PKG_TAR_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
-: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"};
-: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX}"};
-: ${PKG_TAR_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
 : ${PKG_TCSH_SHA256SUM:=b89de7064ab54dac454a266cfe5d8bf66940cb5ed048d0c30674ea62e7ecef9d};
 : ${PKG_TCSH_VERSION:=6.20.00};
 : ${PKG_TCSH_URL:=http://ftp.funet.fi/pub/mirrors/ftp.astron.com/pub/tcsh/tcsh-${PKG_TCSH_VERSION}.tar.gz};
@@ -873,10 +842,53 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_ZSH_URL:="https://ftp.osuosl.org/pub/blfs/conglomeration/zsh/zsh-${PKG_ZSH_VERSION}.tar.xz"};
 
 #
+# Build target minipix
+#
+MINIPIX_CFLAGS_CONFIGURE="${MINIPIX_CFLAGS_CONFIGURE_DEFAULT:+${MINIPIX_CFLAGS_CONFIGURE_DEFAULT} }--sysroot=${PREFIX_NATIVE}";
+MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
+MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+MINIPIX_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_MINIPIX}";
+MINIPIX_PACKAGES="
+ntctty_flavour_minipix ptycon_flavour_minipix
+gzip_flavour_minipix bzip2_flavour_minipix xz_flavour_minipix
+bash_flavour_minipix coreutils_flavour_minipix tar_flavour_minipix";
+MINIPIX_PREFIX="${PREFIX_MINIPIX}";
+: ${PKG_NTCTTY_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${TARGET}"};
+: ${PKG_NTCTTY_FLAVOUR_MINIPIX_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
+: ${PKG_NTCTTY_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
+: ${PKG_PTYCON_FLAVOUR_MINIPIX_CONFIGURE_ARGS:="--prefix= --strict --host=${TARGET}"};
+: ${PKG_PTYCON_FLAVOUR_MINIPIX_ENV_VARS_EXTRA="CFLAGS_PATH=-I${PREFIX_NATIVE}/include:LDFLAGS_PATH=-L${PREFIX_NATIVE}/lib"};
+: ${PKG_PTYCON_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-static-app};
+
+: ${PKG_BZIP2_FLAVOUR_MINIPIX_INSTALL_FILES:="bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"};
+: ${PKG_BZIP2_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
+: ${PKG_BZIP2_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"};
+: ${PKG_BZIP2_FLAVOUR_MINIPIX_NO_MAKE_INSTALL:=1};
+: ${PKG_BZIP2_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
+: ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
+: ${PKG_GZIP_FLAVOUR_MINIPIX_LDFLAGS_INSTALL_EXTRA:="-static"};
+: ${PKG_GZIP_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX} OBJA= prefix="};
+: ${PKG_GZIP_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
+: ${PKG_XZ_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD:="LIBTOOLFLAGS=-all-static"};
+: ${PKG_XZ_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}"};
+: ${PKG_XZ_FLAVOUR_MINIPIX_PREFIX:=${PREFIX_MINIPIX}};
+
+: ${PKG_BASH_CONFIGURE_ARGS_EXTRA:="--without-bash-malloc --with-curses"};
+: ${PKG_BASH_FLAVOUR_MINIPIX_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"};
+: ${PKG_BASH_FLAVOUR_MINIPIX_NO_MAKE_INSTALL:=1};
+: ${PKG_BASH_FLAVOUR_MINIPIX_INSTALL_FILES:="bash=bin/ bashbug=bin/"};
+: ${PKG_COREUTILS_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
+: ${PKG_COREUTILS_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"};
+: ${PKG_COREUTILS_FLAVOUR_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
+: ${PKG_TAR_FLAVOUR_MINIPIX_LDFLAGS_BUILD_EXTRA:="-static"};
+: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="SHARED=0"};
+: ${PKG_TAR_FLAVOUR_MINIPIX_MAKEFLAGS_INSTALL:="-C src install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX}"};
+
+#
 # Build meta-targets
 #
 DEVROOT_PACKAGES="host_toolchain native_toolchain runtime";
-WORLD_PACKAGES="host_toolchain native_toolchain runtime lib_packages leaf_packages";
-ALL_TARGETS="host_toolchain native_toolchain runtime lib_packages leaf_packages devroot world";
+WORLD_PACKAGES="host_toolchain native_toolchain runtime lib_packages leaf_packages minipix";
+ALL_TARGETS="host_toolchain native_toolchain runtime lib_packages leaf_packages minipix devroot world";
 
 # vim:filetype=sh textwidth=0