vars/build.vars:{host,native}_toolchain: merges {host,native}_toolchain_mingw32.

vars/build.vars:native_toolchain: fix group variables.
vars/build.vars:ncurses: moved into native_packags_deps_deps.
vars/build.vars:{bzip2,expat,lib{elf,ffi,readline,z}}: moved into native_packages_deps.
vars/build.vars:{gdb,python2}: moved into native_packages.
vars/gcc.vars: minor cleanup.
etc/build.usage: updated.
subr/ex_pkg_dispatch.subr: disable dependency expansion given -r.

2 files changed, 142 insertions, 179 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 9c609190..52ddf1c2 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -429,9 +429,10 @@ HOST_TOOLCHAIN_BUILD_TYPE="host";
 HOST_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
 HOST_TOOLCHAIN_MAKEFLAGS_INSTALL_EXTRA="prefix= PREFIX=";
 HOST_TOOLCHAIN_PACKAGES="
-binutils_host gcc_full_host gcc_libstdcpp_v3_host gcc_runtime_host
-gcc_stage1_host gmp_host ldso_host mpc_host mpfr_host musl_full_host
-musl_no_complex_host nasm_host psxstub_host psxtypes_host";
+binutils_host binutils_host_mingw32 gcc_full_host gcc_libstdcpp_v3_host
+gcc_runtime_host gcc_stage1_cross_mingw32 gcc_stage1_host gmp_host
+ldso_host mpc_host mpfr_host musl_full_host musl_no_complex_host nasm_host
+psxstub_host psxtypes_host";
 HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_VERSION:=2.24.51};
@@ -444,6 +445,15 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_BINUTILS_HOST_MAKEFLAGS_INSTALL_EXTRA:="PREFIX= prefix="};
 : ${PKG_BINUTILS_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_HOST_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_HOST_PREFIX:=${PREFIX}};
+: ${PKG_BINUTILS_HOST_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
+: ${PKG_BINUTILS_HOST_MINGW32_VERSION:=2.24.51};
+: ${PKG_BINUTILS_HOST_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.tar.bz2};
+: ${PKG_BINUTILS_HOST_MINGW32_CONFIGURE_ARGS:="--disable-nls --disable-werror --enable-deterministic-archives --prefix=${PREFIX} --target=x86_64-w64-mingw32 --with-sysroot=${PREFIX_MINGW32}"};
+: ${PKG_BINUTILS_HOST_MINGW32_LIBTOOL:=slibtool-static};
+: ${PKG_BINUTILS_HOST_MINGW32_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
+: ${PKG_BINUTILS_HOST_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.midipix.patch"};
+: ${PKG_BINUTILS_HOST_MINGW32_PREFIX:=${PREFIX}};
+: ${PKG_BINUTILS_HOST_MINGW32_TARGET:="x86_64-w64-mingw32"};
 : ${PKG_GCC_FULL_HOST_DEPENDS:="gcc_stage1_host gcc_libstdcpp_v3_host ldso_host musl_full_host"};
 : ${PKG_GCC_FULL_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_FULL_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
@@ -463,6 +473,14 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_GCC_RUNTIME_HOST_GITROOT:=${DEFAULT_GITROOT}};
 : ${PKG_GCC_RUNTIME_HOST_NO_CLEAN_BASE_DIR:=1};
 : ${PKG_GCC_RUNTIME_HOST_PREFIX:=${PREFIX}};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_DEPENDS:="binutils_host_mingw32"};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_VERSION:=4.6.4};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-x86_64-w64-mingw32};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_CONFIGURE_ARGS:="--disable-nls --prefix=${PREFIX} --target=x86_64-w64-mingw32"};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_PREFIX:=${PREFIX}};
+: ${PKG_GCC_STAGE1_CROSS_MINGW32_TARGET:="x86_64-w64-mingw32"};
 : ${PKG_GCC_STAGE1_HOST_DEPENDS:="binutils_host gmp_host mpc_host mpfr_host"};
 : ${PKG_GCC_STAGE1_HOST_VERSION:=4.6.4};
 : ${PKG_GCC_STAGE1_HOST_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-${DEFAULT_TARGET}};
@@ -535,29 +553,6 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_PSXTYPES_HOST_IN_TREE:=1};
 
 #
-# Build group host_toolchain_mingw32
-#
-HOST_TOOLCHAIN_MINGW32_BUILD_TYPE="host";
-HOST_TOOLCHAIN_MINGW32_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --target=x86_64-w64-mingw32";
-HOST_TOOLCHAIN_MINGW32_PACKAGES="
-binutils_host_mingw32 gcc_stage1_cross_mingw32";
-HOST_TOOLCHAIN_MINGW32_TARGET="x86_64-w64-mingw32";
-: ${PKG_BINUTILS_HOST_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
-: ${PKG_BINUTILS_HOST_MINGW32_VERSION:=2.24.51};
-: ${PKG_BINUTILS_HOST_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.tar.bz2};
-: ${PKG_BINUTILS_HOST_MINGW32_CONFIGURE_ARGS_EXTRA:="--disable-werror --enable-deterministic-archives --with-sysroot=${PREFIX_MINGW32}"};
-: ${PKG_BINUTILS_HOST_MINGW32_LIBTOOL:=slibtool-static};
-: ${PKG_BINUTILS_HOST_MINGW32_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
-: ${PKG_BINUTILS_HOST_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_HOST_MINGW32_VERSION}.midipix.patch"};
-: ${PKG_BINUTILS_HOST_MINGW32_PREFIX:=${PREFIX}};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_DEPENDS:="binutils_host_mingw32"};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_VERSION:=4.6.4};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-host-x86_64-w64-mingw32};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
-: ${PKG_GCC_STAGE1_CROSS_MINGW32_PREFIX:=${PREFIX}};
-
-#
 # Build group native_tools
 #
 NATIVE_TOOLS_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --program-prefix= --prefix=/ --target=${DEFAULT_TARGET}";
@@ -585,12 +580,9 @@ NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}";
 # Build group native_toolchain
 #
 NATIVE_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --program-prefix= --prefix=/ --target=${DEFAULT_TARGET}";
-NATIVE_TOOLCHAIN_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_TOOLCHAIN_PACKAGES="
-binutils bzip2 expat gcc_full gdb gmp libelf libreadline libz mpc mpfr
-musl_full ncurses python2";
+binutils binutils_mingw32 gcc_full gcc_stage1_native_mingw32 gmp mpc mpfr musl_full ";
 NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
-NATIVE_TOOLCHAIN_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_VERSION:=2.24.51};
 : ${PKG_BINUTILS_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_VERSION}.tar.bz2};
@@ -599,56 +591,31 @@ NATIVE_TOOLCHAIN_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_BINUTILS_LDFLAGS_CONFIGURE:="-L${PREFIX_NATIVE}/lib"};
 : ${PKG_BINUTILS_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_VERSION}.midipix.patch"};
 : ${PKG_BINUTILS_LIBTOOL:=slibtool-static};
-: ${PKG_BZIP2_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
-: ${PKG_BZIP2_VERSION:=1.0.8};
-: ${PKG_BZIP2_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_VERSION}.tar.gz};
-: ${PKG_BZIP2_IN_TREE:=1};
-: ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1=lib/ ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.8=lib/"};
-: ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
-: ${PKG_BZIP2_MAKE_INSTALL_VNAME:=PREFIX};
-: ${PKG_EXPAT_SHA256SUM:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2};
-: ${PKG_EXPAT_VERSION:=2.2.6};
-: ${PKG_EXPAT_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_VERSION}.tar.bz2};
-: ${PKG_GCC_FULL_DEPENDS:="gmp mpc mpfr"};
+: ${PKG_BINUTILS_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
+: ${PKG_BINUTILS_MINGW32_VERSION:=2.24.51};
+: ${PKG_BINUTILS_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_MINGW32_VERSION}.tar.bz2};
+: ${PKG_BINUTILS_MINGW32_CONFIGURE_ARGS:="--disable-nls --enable-deterministic-archives --host=${DEFAULT_TARGET} --prefix=/ --target=x86_64-w64-mingw32 --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"};
+: ${PKG_BINUTILS_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_MINGW32_VERSION}.midipix.patch"};
+: ${PKG_BINUTILS_MINGW32_PREFIX:="${PREFIX_NATIVE}"};
+: ${PKG_BINUTILS_MINGW32_LIBTOOL:=slibtool-static};
+: ${PKG_GCC_FULL_DEPENDS:="binutils gmp mpc mpfr musl_full"};
 : ${PKG_GCC_FULL_VERSION:=4.6.4};
 : ${PKG_GCC_FULL_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-${DEFAULT_TARGET}};
+: ${PKG_GCC_FULL_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
 : ${PKG_GCC_FULL_GITROOT:=${DEFAULT_GITROOT}};
-: ${PKG_GDB_DEPENDS:="expat libreadline ncurses python2"};
-: ${PKG_GDB_SHA256SUM:=149abac4add030a5713f15964bd7465bef7a23712bcc91377ca40949f33e93fb};
-: ${PKG_GDB_VERSION:=7.12};
-: ${PKG_GDB_URL:=ftp://sourceware.org/pub/gdb/releases/gdb-${PKG_GDB_VERSION}.tar.gz};
-: ${PKG_GDB_CFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
-: ${PKG_GDB_CXXFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
-: ${PKG_GDB_CONFIGURE_ARGS_EXTRA:="--with-system-libiberty --with-system-readline --with-system-zlib --with-python=${PWD}/etc/python2.7-config"};
-: ${PKG_GDB_ENV_VARS_EXTRA:="CFLAGS_FOR_TARGET=-g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 --sysroot=${PREFIX_NATIVE}:LDFLAGS_FOR_TARGET=--sysroot=${PREFIX_NATIVE}"};
-: ${PKG_GDB_LIBTOOL:=rdlibtool};
-: ${PKG_GDB_MAKEFLAGS_BUILD_EXTRA:="SYSROOT_FLAGS=--sysroot=${PREFIX_NATIVE}"};
-: ${PKG_GDB_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_VERSION}.midipix.patch"};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_DEPENDS:="binutils_mingw32"};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_VERSION:=4.6.4};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-x86_64-w64-mingw32};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_CONFIGURE_ARGS:="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=x86_64-w64-mingw32"};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_PREFIX:="${PREFIX_NATIVE}"};
+: ${PKG_GCC_STAGE1_NATIVE_MINGW32_TARGET:=x86_64-w64-mingw32};
 : ${PKG_GMP_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2};
 : ${PKG_GMP_VERSION:=6.1.2};
 : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
 : ${PKG_GMP_CONFIGURE_ARGS_EXTRA:=--disable-assembly};
 : ${PKG_GMP_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gmp/gmp-${PKG_GMP_VERSION}.midipix.patch"};
-: ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d};
-: ${PKG_LIBELF_VERSION:=0.8.13};
-: ${PKG_LIBELF_URL:=https://fossies.org/linux/misc/old/libelf-${PKG_LIBELF_VERSION}.tar.gz};
-: ${PKG_LIBELF_MAKE_INSTALL_VNAME:=prefix};
-: ${PKG_LIBELF_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libelf/libelf-${PKG_LIBELF_VERSION}.midipix.patch"};
-: ${PKG_LIBREADLINE_DEPENDS:="ncurses"};
-: ${PKG_LIBREADLINE_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334};
-: ${PKG_LIBREADLINE_VERSION:=7.0};
-: ${PKG_LIBREADLINE_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz};
-: ${PKG_LIBREADLINE_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }-I${PREFIX_NATIVE}/include"};
-: ${PKG_LIBREADLINE_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
-: ${PKG_LIBREADLINE_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"};
-: ${PKG_LIBREADLINE_LDFLAGS_CONFIGURE:="${DEFAULT_LDFLAGS:+${DEFAULT_LDFLAGS} }-L${PREFIX_NATIVE}/lib"};
-: ${PKG_LIBREADLINE_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
-: ${PKG_LIBZ_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b};
-: ${PKG_LIBZ_VERSION:=1.2.8.2015.12.26};
-: ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz};
-: ${PKG_LIBZ_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
-: ${PKG_LIBZ_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET} --enable-shared"};
-: ${PKG_LIBZ_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
 : ${PKG_MPC_DEPENDS:="gmp mpfr"};
 : ${PKG_MPC_SHA256SUM:=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff};
 : ${PKG_MPC_VERSION:=1.0.1};
@@ -659,6 +626,7 @@ NATIVE_TOOLCHAIN_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_MPFR_VERSION:=3.1.2};
 : ${PKG_MPFR_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_VERSION}.tar.bz2};
 : ${PKG_MPFR_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE}};
+: ${PKG_MUSL_FULL_DEPENDS:="binutils"};
 : ${PKG_MUSL_FULL_SHA256SUM:=8a0feb41cef26c97dde382c014e68b9bb335c094bbc1356f6edaaf6b79bd14aa};
 : ${PKG_MUSL_FULL_VERSION:=1.1.23};
 : ${PKG_MUSL_FULL_URL:="http://www.musl-libc.org/releases/musl-${PKG_MUSL_FULL_VERSION}.tar.gz"}
@@ -668,44 +636,6 @@ NATIVE_TOOLCHAIN_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_MUSL_FULL_CONFIGURE:=build/mmglue/configure};
 : ${PKG_MUSL_FULL_CONFIGURE_ARGS:="--source-dir=../../musl-${PKG_MUSL_FULL_VERSION} --prefix= --target=${DEFAULT_TARGET} --sysroot=${PREFIX_CROSS}"};
 : ${PKG_MUSL_FULL_SUBDIR:=musl-${PKG_MUSL_FULL_VERSION}};
-: ${PKG_NCURSES_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
-: ${PKG_NCURSES_VERSION:=6.1};
-: ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz};
-: ${PKG_NCURSES_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
-: ${PKG_NCURSES_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"};
-: ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --without-manpages --without-progs --with-shared --with-termlib --without-ada --without-tests --disable-widec --without-pthread"};
-: ${PKG_NCURSES_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
-: ${PKG_PYTHON2_DEPENDS:="bzip2 libreadline ncurses"};
-: ${PKG_PYTHON2_SHA256SUM:=18617d1f15a380a919d517630a9cd85ce17ea602f9bbdc58ddc672df4b0239db};
-: ${PKG_PYTHON2_VERSION:=2.7.15};
-: ${PKG_PYTHON2_URL:="https://www.python.org/ftp/python/${PKG_PYTHON2_VERSION}/Python-${PKG_PYTHON2_VERSION}.tgz"};
-: ${PKG_PYTHON2_URLS_GIT:="sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"};
-: ${PKG_PYTHON2_BASE_DIR:=${BUILD_WORKDIR}/python2-native-${DEFAULT_TARGET}};
-: ${PKG_PYTHON2_BUILD_DIR:=build/python2};
-: ${PKG_PYTHON2_CONFIGURE:=build/sbpython2/configure};
-: ${PKG_PYTHON2_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"};
-: ${PKG_PYTHON2_ENV_VARS_EXTRA:="NATIVE_CFLAGS=-std=c99 -D_XOPEN_SOURCE=700 -I${PREFIX}/include:NATIVE_LDFLAGS=-L${PREFIX}/lib -ltinfo -Wl,-rpath,${PREFIX}/lib"};
-
-
-#
-# Build group native_toolchain_mingw32
-#
-NATIVE_TOOLCHAIN_MINGW32_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=x86_64-w64-mingw32";
-NATIVE_TOOLCHAIN_MINGW32_PACKAGES="
-binutils_mingw32 gcc_stage1_native_mingw32";
-NATIVE_TOOLCHAIN_MINGW32_PREFIX="${PREFIX_NATIVE}";
-: ${PKG_BINUTILS_MINGW32_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
-: ${PKG_BINUTILS_MINGW32_VERSION:=2.24.51};
-: ${PKG_BINUTILS_MINGW32_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_MINGW32_VERSION}.tar.bz2};
-: ${PKG_BINUTILS_MINGW32_CONFIGURE_ARGS_EXTRA:="--enable-deterministic-archives --with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/"};
-: ${PKG_BINUTILS_MINGW32_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/binutils/binutils-${PKG_BINUTILS_MINGW32_VERSION}.midipix.patch"};
-: ${PKG_BINUTILS_MINGW32_LIBTOOL:=slibtool-static};
-: ${PKG_GCC_STAGE1_NATIVE_MINGW32_DEPENDS:="binutils_mingw32"};
-: ${PKG_GCC_STAGE1_NATIVE_MINGW32_VERSION:=4.6.4};
-: ${PKG_GCC_STAGE1_NATIVE_MINGW32_BASE_DIR:=${BUILD_WORKDIR}/gcc-native-x86_64-w64-mingw32};
-: ${PKG_GCC_STAGE1_NATIVE_MINGW32_CFLAGS_CONFIGURE:="-I${PREFIX}/include"};
-: ${PKG_GCC_STAGE1_NATIVE_MINGW32_GITROOT:=${DEFAULT_GITROOT}};
-: ${PKG_GCC_STAGE1_NATIVE_MINGW32_TARGET:=x86_64-w64-mingw32};
 
 #
 # Build group native_runtime
@@ -736,7 +666,7 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_NTCTTY_URLS_GIT:=ntctty=${DEFAULT_GITROOT_HEAD}/ntctty};
 : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_NTCTTY_SRC_TARBALL_DISABLE:=1};
-: ${PKG_NTUX_DEPENDS:="dalist ldso ntapi pemagine"};
+: ${PKG_NTUX_DEPENDS:="dalist ldso ntapi pemagine psxscl"};
 : ${PKG_NTUX_URLS_GIT:=ntux=${DEFAULT_GITROOT}/ntux};
 : ${PKG_NTUX_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_NTUX_HOST_INSTALL_FILES:="ntux/bin/ntux=bin/ntux"};
@@ -758,7 +688,7 @@ NATIVE_RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PSXTYPES_URLS_GIT:=psxtypes=${DEFAULT_GITROOT}/psxtypes};
 : ${PKG_PSXTYPES_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
 : ${PKG_PSXTYPES_IN_TREE:=1};
-: ${PKG_PTYCON_DEPENDS:="dalist ldso ntapi ntcon"};
+: ${PKG_PTYCON_DEPENDS:="dalist ldso ntapi ntcon psxscl"};
 : ${PKG_PTYCON_URLS_GIT:=ptycon=${DEFAULT_GITROOT}/ptycon};
 : ${PKG_PTYCON_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PTYCON_INSTALL_TARGET_EXTRA:="install-app install-lib"};
@@ -782,7 +712,7 @@ NATIVE_PACKAGES_DEPS_DEPS_IN_ORDER=1;
 NATIVE_PACKAGES_DEPS_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_DEPS_PACKAGES="
-curl libarchive ncursestw ncursesw libuv";
+curl libarchive ncurses ncursestw ncursesw libuv";
 NATIVE_PACKAGES_DEPS_DEPS_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_CURL_SHA256SUM:=ef6e55192d04713673b4409ccbcb4cb6cd723137d6e10ca45b0c593a454e1720};
@@ -793,6 +723,13 @@ NATIVE_PACKAGES_DEPS_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_LIBARCHIVE_VERSION:=3.3.3};
 : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz};
 : ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
+: ${PKG_NCURSES_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
+: ${PKG_NCURSES_VERSION:=6.1};
+: ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz};
+: ${PKG_NCURSES_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
+: ${PKG_NCURSES_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"};
+: ${PKG_NCURSES_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --without-manpages --without-progs --with-shared --with-termlib --without-ada --without-tests --disable-widec --without-pthread"};
+: ${PKG_NCURSES_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
 : ${PKG_NCURSESTW_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
 : ${PKG_NCURSESTW_VERSION:=6.1};
 : ${PKG_NCURSESTW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESTW_VERSION}.tar.gz};
@@ -816,17 +753,54 @@ NATIVE_PACKAGES_DEPS_IN_ORDER=1;
 NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_PACKAGES="
-bmake libasr libatomic_ops bdwgc clzip xz libxml2 alsa_lib apr apr_util
-libdmtx libressl libnettle libunistring gnutls lmdb libpcap libpng
-libjpeg_turbo tiff giflib lcms2 openjpeg libedit libffi gdbm geoip
-pcre gettext_tiny glib gzip musl_compat musl_fts libzip libpipeline
-libtelnet libevent libfetch libogg libvorbis libflac libtheora libsasl2
-libshine libsndfile libgpg_error libassuan libfirm libgcrypt libksba
-libudns lua libxslt libtirpc npth popt file zstd dbus rpm libsolv tdnf
-shared_mime_info sqlite3 w32api w32lib cmake qrencode tcl util_linux
-slang utf8proc";
+libffi bzip2 expat libelf libreadline libz bmake libasr libatomic_ops
+bdwgc clzip xz libxml2 alsa_lib apr apr_util libdmtx libressl libnettle
+libunistring gnutls lmdb libpcap libpng libjpeg_turbo tiff giflib lcms2
+openjpeg libedit gdbm geoip pcre gettext_tiny glib gzip musl_compat
+musl_fts libzip libpipeline libtelnet libevent libfetch libogg libvorbis
+libflac libtheora libsasl2 libshine libsndfile libgpg_error libassuan
+libfirm libgcrypt libksba libudns lua libxslt libtirpc npth popt file
+zstd dbus rpm libsolv tdnf shared_mime_info sqlite3 w32api w32lib cmake
+qrencode tcl util_linux slang utf8proc";
 NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
+: ${PKG_LIBFFI_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
+: ${PKG_LIBFFI_VERSION:=3.2.1};
+: ${PKG_LIBFFI_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
+: ${PKG_LIBFFI_ENV_VARS_EXTRA:="MAKE=make LIBTOOL=slibtool"};
+: ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64};
+: ${PKG_LIBFFI_INSTALL_FILES:="lib/libffi-${PKG_LIBFFI_VERSION}/include/ffi.h=include/ffi.h lib/libffi-${PKG_LIBFFI_VERSION}/include/ffitarget.h=include/ffitarget.h"};
+: ${PKG_LIBFFI_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libffi/libffi-${PKG_LIBFFI_VERSION}.midipix.patch"};
+: ${PKG_BZIP2_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
+: ${PKG_BZIP2_VERSION:=1.0.8};
+: ${PKG_BZIP2_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_VERSION}.tar.gz};
+: ${PKG_BZIP2_IN_TREE:=1};
+: ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1=lib/ ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.8=lib/"};
+: ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
+: ${PKG_BZIP2_MAKE_INSTALL_VNAME:=PREFIX};
+: ${PKG_EXPAT_SHA256SUM:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2};
+: ${PKG_EXPAT_VERSION:=2.2.6};
+: ${PKG_EXPAT_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_VERSION}.tar.bz2};
+: ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d};
+: ${PKG_LIBELF_VERSION:=0.8.13};
+: ${PKG_LIBELF_URL:=https://fossies.org/linux/misc/old/libelf-${PKG_LIBELF_VERSION}.tar.gz};
+: ${PKG_LIBELF_MAKE_INSTALL_VNAME:=prefix};
+: ${PKG_LIBELF_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libelf/libelf-${PKG_LIBELF_VERSION}.midipix.patch"};
+: ${PKG_LIBREADLINE_DEPENDS:="ncurses"};
+: ${PKG_LIBREADLINE_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334};
+: ${PKG_LIBREADLINE_VERSION:=7.0};
+: ${PKG_LIBREADLINE_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz};
+: ${PKG_LIBREADLINE_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }-I${PREFIX_NATIVE}/include"};
+: ${PKG_LIBREADLINE_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
+: ${PKG_LIBREADLINE_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"};
+: ${PKG_LIBREADLINE_LDFLAGS_CONFIGURE:="${DEFAULT_LDFLAGS:+${DEFAULT_LDFLAGS} }-L${PREFIX_NATIVE}/lib"};
+: ${PKG_LIBREADLINE_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
+: ${PKG_LIBZ_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b};
+: ${PKG_LIBZ_VERSION:=1.2.8.2015.12.26};
+: ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz};
+: ${PKG_LIBZ_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
+: ${PKG_LIBZ_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET} --enable-shared"};
+: ${PKG_LIBZ_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
 : ${PKG_BMAKE_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
 : ${PKG_BMAKE_CONFIGURE_ARGS="-C --host=${DEFAULT_TARGET} --prefix=/usr --target=${DEFAULT_TARGET}"};
 : ${PKG_BMAKE_ENV_VARS_EXTRA:="BMAKE=${PREFIX}/bin/bmake"};
@@ -920,13 +894,6 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_LIBEDIT_VERSION:=20191231-3.1};
 : ${PKG_LIBEDIT_URL:=https://www.thrysoee.dk/editline/libedit-${PKG_LIBEDIT_VERSION}.tar.gz};
 : ${PKG_LIBEDIT_CFLAGS_BUILD_EXTRA:="--include=stdc-predef.h"};
-: ${PKG_LIBFFI_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
-: ${PKG_LIBFFI_VERSION:=3.2.1};
-: ${PKG_LIBFFI_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_VERSION}.tar.gz};
-: ${PKG_LIBFFI_ENV_VARS_EXTRA:="MAKE=make LIBTOOL=slibtool"};
-: ${PKG_LIBFFI_CFLAGS_CONFIGURE_EXTRA:=-D_WIN64};
-: ${PKG_LIBFFI_INSTALL_FILES:="lib/libffi-${PKG_LIBFFI_VERSION}/include/ffi.h=include/ffi.h lib/libffi-${PKG_LIBFFI_VERSION}/include/ffitarget.h=include/ffitarget.h"};
-: ${PKG_LIBFFI_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libffi/libffi-${PKG_LIBFFI_VERSION}.midipix.patch"};
 : ${PKG_GDBM_SHA256SUM:=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc};
 : ${PKG_GDBM_VERSION:=1.18.1};
 : ${PKG_GDBM_URL:=ftp://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_VERSION}.tar.gz};
@@ -1539,7 +1506,8 @@ the_silver_searcher toilet tree terminally_tetris ubase which w3m zsh";
 #
 # Packages list native_packages_dev
 NATIVE_PACKAGES_DEV_PACKAGES="
-bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils perl python3 ruby smallbasic tk";
+bison chicken cparser diffutils flex gdb_host lunix m4 make mandoc nasm
+patch patchutils perl python2 python3 ruby smallbasic tk";
 : ${PKG_BISON_SHA256SUM:=55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641};
 : ${PKG_BISON_VERSION:=3.5};
 : ${PKG_BISON_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_VERSION}.tar.xz};
@@ -1566,6 +1534,17 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils
 : ${PKG_FLEX_VERSION:=2.6.4};
 : ${PKG_FLEX_URL:=https://github.com/westes/flex/releases/download/v${PKG_FLEX_VERSION}/flex-${PKG_FLEX_VERSION}.tar.gz};
 : ${PKG_FLEX_CONFIGURE_ARGS_EXTRA:=--disable-libfl};
+: ${PKG_GDB_DEPENDS:="expat libreadline ncurses python2"};
+: ${PKG_GDB_SHA256SUM:=149abac4add030a5713f15964bd7465bef7a23712bcc91377ca40949f33e93fb};
+: ${PKG_GDB_VERSION:=7.12};
+: ${PKG_GDB_URL:=ftp://sourceware.org/pub/gdb/releases/gdb-${PKG_GDB_VERSION}.tar.gz};
+: ${PKG_GDB_CFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
+: ${PKG_GDB_CXXFLAGS_CONFIGURE_EXTRA:="--sysroot=${PREFIX_NATIVE} -g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 -L${PREFIX_NATIVE}/lib"};
+: ${PKG_GDB_CONFIGURE_ARGS_EXTRA:="--with-system-libiberty --with-system-readline --with-system-zlib --with-python=${PWD}/etc/python2.7-config"};
+: ${PKG_GDB_ENV_VARS_EXTRA:="CFLAGS_FOR_TARGET=-g3 -O0 --include=stdc-predef.h -I${PREFIX_NATIVE}/include/python2.7 --sysroot=${PREFIX_NATIVE}:LDFLAGS_FOR_TARGET=--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_GDB_LIBTOOL:=rdlibtool};
+: ${PKG_GDB_MAKEFLAGS_BUILD_EXTRA:="SYSROOT_FLAGS=--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_GDB_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/gdb/gdb-${PKG_GDB_VERSION}.midipix.patch"};
 : ${PKG_LUNIX_URLS_GIT:=lunix=https://github.com/Redfoxmoon3/lunix.git@master};
 : ${PKG_LUNIX_IN_TREE:=1};
 : ${PKG_LUNIX_MAKEFLAGS_BUILD:="all5.3 libdir=${PREFIX_NATIVE}/lib"};
@@ -1599,6 +1578,16 @@ bison chicken cparser diffutils flex lunix m4 make mandoc nasm patch patchutils
 : ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${DEFAULT_TARGET}"};
 : ${PKG_PERL_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_PERL_SUBDIR:=perl-${PKG_PERL_VERSION}};
+: ${PKG_PYTHON2_DEPENDS:="bzip2 libffi libreadline ncurses"};
+: ${PKG_PYTHON2_SHA256SUM:=18617d1f15a380a919d517630a9cd85ce17ea602f9bbdc58ddc672df4b0239db};
+: ${PKG_PYTHON2_VERSION:=2.7.15};
+: ${PKG_PYTHON2_URL:="https://www.python.org/ftp/python/${PKG_PYTHON2_VERSION}/Python-${PKG_PYTHON2_VERSION}.tgz"};
+: ${PKG_PYTHON2_URLS_GIT:="sbpython2=${DEFAULT_GITROOT}/python/sbpython2@main"};
+: ${PKG_PYTHON2_BASE_DIR:=${BUILD_WORKDIR}/python2-native-${DEFAULT_TARGET}};
+: ${PKG_PYTHON2_BUILD_DIR:=build/python2};
+: ${PKG_PYTHON2_CONFIGURE:=build/sbpython2/configure};
+: ${PKG_PYTHON2_CONFIGURE_ARGS:="--source-dir=../../Python-${PKG_PYTHON2_VERSION} --sysroot=${PREFIX_NATIVE} --prefix= --target=${DEFAULT_TARGET}"};
+: ${PKG_PYTHON2_ENV_VARS_EXTRA:="NATIVE_CFLAGS=-std=c99 -D_XOPEN_SOURCE=700 -I${PREFIX}/include:NATIVE_LDFLAGS=-L${PREFIX}/lib -ltinfo -Wl,-rpath,${PREFIX}/lib"};
 : ${PKG_PYTHON3_SHA256SUM:=ab6193af1921b30f587b302fe385268510e80187ca83ca82d2bfe7ab544c6f91};
 : ${PKG_PYTHON3_VERSION:=3.6.3};
 : ${PKG_PYTHON3_URL:="https://www.python.org/ftp/python/${PKG_PYTHON3_VERSION}/Python-${PKG_PYTHON3_VERSION}.tgz"};
@@ -2107,8 +2096,7 @@ INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_minipix inva
 # Build groups
 #
 GROUPS_DEFAULT="
-host_tools host_deps host_deps_rpm host_toolchain host_toolchain_mingw32
-native_tools native_toolchain native_toolchain_mingw32 native_runtime
+host_tools host_deps host_deps_rpm host_toolchain native_tools native_toolchain native_runtime
 host_packages_deps native_packages_deps_deps native_packages_deps native_packages_deps_x11
 native_packages
 minipix";
diff --git a/vars/gcc.vars b/vars/gcc.vars
index 67bcdb85..d8f48adf 100644
--- a/vars/gcc.vars
+++ b/vars/gcc.vars
@@ -4,9 +4,8 @@
 # Order: stage1_mingw32, native_mingw32
 #
 
-pkgp_gcc_build_dir() {
-	PKG_BUILD_DIR="${1}-${2}-${PKG_TARGET}";
-};
+pkgp_gcc_build_dir() { PKG_BUILD_DIR="${1}-${2}-${PKG_TARGET}"; };
+pkgp_gcc_state_set() { echo "step unknown ${PKG_NAME} ${1}" >&3; ex_pkg_state_set "${PKG_NAME}" ${1} -${2}; };
 
 pkgp_gcc_setup_env() {
 	local __="";
@@ -87,7 +86,7 @@ pkgp_gcc_configure() {
 		--enable-threads=posix			\
 		--target="${PKG_TARGET}"		\
 		--with-fpmath=sse;
-	ex_pkg_state_set "${PKG_NAME}" configure -build;
+	pkgp_gcc_state_set configure build;
 };
 
 pkg_gcc_stage1_host_all() {
@@ -128,15 +127,13 @@ pkg_gcc_stage1_all() {
 	# GCC, stage1.
 	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
 		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
-		echo "step unknown ${PKG_NAME} fetch" >&3;
-		ex_pkg_state_set "${PKG_NAME}" fetch -patch;
+		pkgp_gcc_state_set fetch patch;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
 		if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
 			patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch";
 		fi;
-		echo "step unknown ${PKG_NAME} patch" >&3;
-		ex_pkg_state_set "${PKG_NAME}" patch -configure;
+		pkgp_gcc_state_set patch configure;
 	fi;
 	pkgp_gcc_setup_env "${PKG_VERSION}";
 	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
@@ -176,13 +173,11 @@ pkg_gcc_stage1_all() {
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-gcc;
-		echo "step unknown ${PKG_NAME} build" >&3;
-		ex_pkg_state_set "${PKG_NAME}" build -install;
+		pkgp_gcc_state_set build install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 		pkg_install_subdirs;
-		echo "step unknown ${PKG_NAME} install_subdirs" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make;
+		pkgp_gcc_state_set install_subdirs install_make;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 		case "${PKG_NAME}" in
@@ -198,12 +193,10 @@ pkg_gcc_stage1_all() {
 			ex_rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.dll.a"	\
 				ex_rtl_fileop ln_symbolic "${PKG_DESTDIR}/libexec/gcc/${PKG_TARGET}/${PKG_VERSION}/liblto_plugin.so";
 		fi;
-		echo "step unknown ${PKG_NAME} install_make" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_make -install;
+		pkgp_gcc_state_set install_make install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		pkg_install;
-		echo "step unknown ${PKG_NAME} install" >&3;
 		ex_pkg_state_set "${PKG_NAME}" install finish;
 	fi;
 };
@@ -217,22 +210,18 @@ pkg_gcc_runtime_host_all() {
 	# GCC, compiler runtime.
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libgcc ${_vis_hide};
-		echo "step unknown ${PKG_NAME} build" >&3;
-		ex_pkg_state_set "${PKG_NAME}" build -install;
+		pkgp_gcc_state_set build install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 		pkg_install_subdirs;
-		echo "step unknown ${PKG_NAME} install_subdirs" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make;
+		pkgp_gcc_state_set install_subdirs install_make;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" install-target-libgcc;
-		echo "step unknown ${PKG_NAME} install_make" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_make -install;
+		pkgp_gcc_state_set install_make install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		pkg_install;
-		echo "step unknown ${PKG_NAME} install" >&3;
 		ex_pkg_state_set "${PKG_NAME}" install finish;
 	fi;
 };
@@ -245,22 +234,18 @@ pkg_gcc_libstdcpp_v3_host_all() {
 	# GCC, libstdc++-v3.
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3;
-		echo "step unknown ${PKG_NAME} build" >&3;
-		ex_pkg_state_set "${PKG_NAME}" build -install;
+		pkgp_gcc_state_set build install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 		pkg_install_subdirs;
-		echo "step unknown ${PKG_NAME} install_subdirs" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make;
+		pkgp_gcc_state_set install_subdirs install_make;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" install-target-libstdc++-v3;
-		echo "step unknown ${PKG_NAME} install_make" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_make -install;
+		pkgp_gcc_state_set install_make install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		pkg_install;
-		echo "step unknown ${PKG_NAME} install" >&3;
 		ex_pkg_state_set "${PKG_NAME}" install finish;
 	fi;
 };
@@ -273,22 +258,18 @@ pkg_gcc_full_host_all() {
 	# GCC, everything else.
 	if ! ex_pkg_state_test "${PKG_NAME}" build "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD};
-		echo "step unknown ${PKG_NAME} build" >&3;
-		ex_pkg_state_set "${PKG_NAME}" build -install;
+		pkgp_gcc_state_set build install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 		pkg_install_subdirs;
-		echo "step unknown ${PKG_NAME} install_subdirs" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make;
+		pkgp_gcc_state_set install_subdirs install_make;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" install;
-		echo "step unknown ${PKG_NAME} install_make" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_make -install;
+		pkgp_gcc_state_set install_make install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		pkg_install;
-		echo "step unknown ${PKG_NAME} install" >&3;
 		ex_pkg_state_set "${PKG_NAME}" install finish;
 	fi;
 };
@@ -301,15 +282,13 @@ pkg_gcc_full_all() {
 	pkgp_gcc_build_dir "cbb-gcc-${PKG_VERSION}" native;
 	if ! ex_pkg_state_test "${PKG_NAME}" fetch "${_restart_at}"; then
 		ex_rtl_fetch_urls_git "${PKG_BASE_DIR}" "cbb-gcc-${PKG_VERSION}=${PKG_GITROOT}/cbb/cbb-gcc-${PKG_VERSION}";
-		echo "step unknown ${PKG_NAME} fetch" >&3;
-		ex_pkg_state_set "${PKG_NAME}" fetch -patch;
+		pkgp_gcc_state_set fetch patch;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" patch "${_restart_at}"; then
 		if [ -e "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch" ]; then
 			patch -b -d "${PKG_BASE_DIR}" -p0 < "${MIDIPIX_BUILD_PWD}/patches/${PKG_NAME}.local.patch";
 		fi;
-		echo "step unknown ${PKG_NAME} patch" >&3;
-		ex_pkg_state_set "${PKG_NAME}" patch -configure;
+		pkgp_gcc_state_set patch configure;
 	fi;
 	pkgp_gcc_setup_env "${PKG_VERSION}";
 	if ! ex_pkg_state_test "${PKG_NAME}" configure "${_restart_at}"; then
@@ -340,22 +319,18 @@ pkg_gcc_full_all() {
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libstdc++-v3;
 		make ${PKG_MAKEFLAGS_BUILD} all-target-libgfortran;
 		make ${PKG_MAKEFLAGS_BUILD} all;
-		echo "step unknown ${PKG_NAME} build" >&3;
-		ex_pkg_state_set "${PKG_NAME}" build -install;
+		pkgp_gcc_state_set build install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_subdirs "${_restart_at}"; then
 		pkg_install_subdirs;
-		echo "step unknown ${PKG_NAME} install_subdirs" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_subdirs -install_make;
+		pkgp_gcc_state_set install_subdirs install_make;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install_make "${_restart_at}"; then
 		make ${PKG_MAKEFLAGS_BUILD} "prefix=${PKG_DESTDIR}" install;
-		echo "step unknown ${PKG_NAME} install_make" >&3;
-		ex_pkg_state_set "${PKG_NAME}" install_make -install;
+		pkgp_gcc_state_set install_make install;
 	fi;
 	if ! ex_pkg_state_test "${PKG_NAME}" install "${_restart_at}"; then
 		pkg_install;
-		echo "step unknown ${PKG_NAME} install" >&3;
 		ex_pkg_state_set "${PKG_NAME}" install finish;
 	fi;
 };