- Drops {bash,coreutils}_host in favour of dynamically-linked ${PREFIX_MINIPIX} binaries and libraries.

- Manually install ncursesw {bin,lib,share}/ files to ${PREFIX_MINIPIX}.

1 files changed, 7 insertions, 19 deletions

diff --git a/build.vars b/build.vars
index f9653144..3a7f1c8c 100644
--- a/build.vars
+++ b/build.vars
@@ -45,7 +45,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${CHECK_PREREQ_FILES:="/usr/include/gmpxx.h /usr/include/mpc.h /usr/include/mpfr.h"};
 : ${CHECK_PATH_VARS:="PREFIX PREFIX_NATIVE PREFIX_CROSS DLCACHEDIR WORKDIR"};
 : ${CLEAR_ENV_VARS_EXCEPT:="ARG_TARBALL ARG_VERBOSE HOME PATH SHELL TERM USER"};
-: ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec native share tmp x86_64-nt64-midipix"};
+: ${CLEAR_PREFIX_DIRS:="bin i686-nt32-midipix include lib lib64 libexec minipix native share tmp x86_64-nt64-midipix"};
 : ${GITROOT:=git://midipix.org};
 : ${GITROOT_HEAD:=git://midipix.org};
 : ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT ARCH BUILD PKG_LVL0_CFLAGS_CONFIGURE PKG_LVL1_CFLAGS_CONFIGURE PKG_LVL2_CFLAGS_CONFIGURE PKG_LVL3_CFLAGS_CONFIGURE PREFIX PREFIX_NATIVE PREFIX_CROSS WORKDIR"};
@@ -131,7 +131,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160};
 : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
 : ${PKG_GMP_CONFIGURE_ARGS_EXTRA:=--disable-assembly};
-: ${PKG_GMP_PREFIX_EXTRA:=DESTDIR=${PREFIX_CROSS}};
+: ${PKG_GMP_PREFIX_EXTRA:=${PREFIX_CROSS}};
 : ${PKG_LIBELF_VERSION:=0.8.13};
 : ${PKG_LIBELF_SHA256SUM:=591a9b4ec81c1f2042a97aa60564e0cb79d041c52faa7416acb38bc95bd2c76d};
 : ${PKG_LIBELF_URL:=http://www.mr511.de/software/libelf-${PKG_LIBELF_VERSION}.tar.gz};
@@ -141,12 +141,12 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_MPC_SHA256SUM:=ed5a815cfea525dc778df0cb37468b9c1b554aaf30d9328b1431ca705b7400ff};
 : ${PKG_MPC_URL:=ftp://ftp.gnu.org/gnu/mpc/mpc-${PKG_MPC_VERSION}.tar.gz};
 : ${PKG_MPC_CONFIGURE_ARGS_EXTRA:=--with-gmp=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE}};
-: ${PKG_MPC_PREFIX_EXTRA:=DESTDIR=${PREFIX_CROSS}};
+: ${PKG_MPC_PREFIX_EXTRA:=${PREFIX_CROSS}};
 : ${PKG_MPFR_VERSION:=3.1.2};
 : ${PKG_MPFR_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b};
 : ${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_MPFR_PREFIX_EXTRA:=DESTDIR=${PREFIX_CROSS}};
+: ${PKG_MPFR_PREFIX_EXTRA:=${PREFIX_CROSS}};
 : ${PKG_MUSL_VERSION:=1.1.12};
 : ${PKG_MUSL_SHA256SUM:=720b83c7e276b4b679c0bffe9509340d5f81fd601508e607e708177df0d31c0e};
 : ${PKG_MUSL_URL:=http://www.musl-libc.org/releases/musl-${PKG_MUSL_VERSION}.tar.gz};
@@ -169,7 +169,7 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_NTCON_URL:=${GITROOT}/ntcon};
 : ${PKG_NTCTTY_URL:=${GITROOT_HEAD}/ntctty};
 : ${PKG_NTCTTY_CFLAGS_CONFIGURE_EXTRA:=-O0};
-: ${PKG_NTCTTY_PREFIX_EXTRA:=DESTDIR=${PREFIX_MINIPIX}};
+: ${PKG_NTCTTY_PREFIX_EXTRA:=${PREFIX_MINIPIX}};
 : ${PKG_PEMAGINE_URL:=${GITROOT}/pemagine};
 : ${PKG_PEMAGINE_CFLAGS_CONFIGURE_EXTRA:=-O0};
 : ${PKG_PSXSCL_URL:=${GITROOT_HEAD}/psxscl};
@@ -255,7 +255,6 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_NCURSESW_BUILD_DIR:=ncursesw-${PKG_NCURSESW_VERSION}-native-${TARGET}};
 : ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --program-prefix= --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-shared --with-manpages --with-progs --without-tests --enable-widec --without-pthread"};
 : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
-: ${PKG_NCURSESW_PREFIX_EXTRA:=DESTDIR=${PREFIX_MINIPIX}};
 : ${PKG_PCRE_VERSION:=8.39};
 : ${PKG_PCRE_SHA256SUM:=ccdf7e788769838f8285b3ee672ed573358202305ee361cfec7a4a4fb005bbc7};
 : ${PKG_PCRE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PKG_PCRE_VERSION}.tar.gz};
@@ -355,22 +354,11 @@ PKG_LVL3_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 : ${PKG_BASH_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4};
 : ${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_STATIC_VERSION:=4.3};
-: ${PKG_BASH_STATIC_SHA256SUM:=afc687a28e0e24dc21b988fa159ff9dbcf6b7caa92ade8645cc6d5605cd024d4};
-: ${PKG_BASH_STATIC_URL:=https://ftp.gnu.org/gnu/bash/bash-${PKG_BASH_VERSION}.tar.gz};
-: ${PKG_BASH_STATIC_CONFIGURE_ARGS_EXTRA:="--enable-static-link --without-bash-malloc --with-curses"};
-: ${PKG_BASH_STATIC_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}/"};
-: ${PKG_BASH_STATIC_PREFIX=${PREFIX_MINIPIX}};
+: ${PKG_BASH_PREFIX_EXTRA:=${PREFIX_MINIPIX}};
 : ${PKG_COREUTILS_VERSION:=8.23};
 : ${PKG_COREUTILS_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
-: ${PKG_COREUTILS_STATIC_VERSION:=8.23};
-: ${PKG_COREUTILS_STATIC_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
-: ${PKG_COREUTILS_STATIC_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
-: ${PKG_COREUTILS_STATIC_LDFLAGS_BUILD_EXTRA:=-static};
-: ${PKG_COREUTILS_STATIC_MAKEFLAGS_BUILD_EXTRA:=SHARED=0};
-: ${PKG_COREUTILS_STATIC_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_MINIPIX}/"};
-: ${PKG_COREUTILS_STATIC_PREFIX=${PREFIX_MINIPIX}};
+: ${PKG_COREUTILS_PREFIX_EXTRA:=${PREFIX_MINIPIX}};
 : ${PKG_CRON_URL:=git://anonscm.debian.org/pkg-cron/pkg-cron.git};
 : ${PKG_CRON_URL_TYPE:=git};
 : ${PKG_CRON_BUILD_DIR:=pkg-cron.git};