Adds and integrates slibtool:

- Adds ${PKG_SLIBTOOL}.
- pkg.build: export ${MAKE} as `make LIBTOOL=${PKG_SLIBTOOL}'.
- binutils{_host,}: use slibtool-static.
- git: add NEEDS_SSL_WITH_CURL=1 to ${PKG_GIT_MAKEFLAGS_BUILD_EXTRA}.
- pacman-5.0.1: add `LIBALPM_LIBS=-lssl -lbz2 -llzma -lz' to
  ${PKG_PACMAN_ENV_VARS_EXTRA}; Makefile.am patch.

Introduces 32-bit (i686-nt32-midipix) support, selected by ARCH=nt32 and
defaulting to 64-bit builds:
- Create ${PREFIX_TARGET}/lib.
- Remove ${PREFIX_TARGET} when cleaning the prefix if -c has been specified.
- Set ${HOST_NATIVE}, ${TARGET}, and ${TARBALL_{SRC_,}FNAME_PREFIX} from ${ARCH}.
- pkg.build: use ${TARGET}-dlltool instead of x86_64-nt64-midipix-dlltool.
- glib-2.46.2: broken at present.
- libffi-3.2.1/src/x86/win32.S: fix symbol prefix.
- musl-1.1.12/arch/nt32/bits/syscall.h: copied from musl-1.1.12/arch/nt64/bits/syscall.h.
- perl-5.22.1: Set --target from ${TARGET}.

Bug fixes:
- psxstub: make {_,__}so_entry_point weak symbols to express preference for
  the real psxscl shared object.
- bash-4.3: fix lib/intl/libgnuintl.h issue.
- libarchive-3.1.2: import FreeBSD-SA-16:23.libarchive and FreeBSD-SA-16:22.libarchive
  security fixes.

Include all directories beneath ${WORKDIR} in the source tarball.
Updated TODO list at the end of README.

1 files changed, 24 insertions, 10 deletions

diff --git a/build.vars b/build.vars
index 0426c845..0b650870 100644
--- a/build.vars
+++ b/build.vars
@@ -19,19 +19,26 @@
 : ${CLEAR_ENV_VARS_EXCEPT:="HOME PATH SHELL TERM USER"};
 : ${GITROOT:=git://midipix.org};
 : ${GITROOT_HEAD:=git://midipix.org};
-: ${HOST_NATIVE:=x86_64-nt64-midipix};
+if [ "${ARCH}" = nt32 ]; then
+	: ${HOST_NATIVE:=i686-nt32-midipix};
+	: ${TARGET:=i686-nt32-midipix};
+elif [ "${ARCH}" = nt64 ]; then
+	: ${HOST_NATIVE:=x86_64-nt64-midipix};
+	: ${TARGET:=x86_64-nt64-midipix};
+else
+	log_msg failexit "Error: invalid ARCHitecture \`${ARCH}'.";
+fi;
 : ${LOG_ENV_VARS:="HOME PATH SHELL USER GITROOT PKG_LVL0_CFLAGS_CONFIGURE PKG_LVL1_CFLAGS_CONFIGURE PKG_LVL2_CFLAGS_CONFIGURE PKG_LVL3_CFLAGS_CONFIGURE PREFIX PREFIX_NATIVE PREFIX_TARGET PREFIX_LVL0 PREFIX_LVL1 PREFIX_LVL2 PREFIX_LVL3 WORKDIR MAKEFLAGS"};
 : ${LOG_MSG_FAIL_COLOUR:=91};
 : ${LOG_MSG_INFO_COLOUR:=93};
 : ${LOG_MSG_SUCC_COLOUR:=92};
 : ${LOG_MSG_WARN_COLOUR:=96};
 : ${MAKEFLAGS_DEFAULT:=-j8};
-: ${TARBALL_FNAME_PREFIX:=midipix.};
+: ${TARBALL_FNAME_PREFIX:=midipix-${ARCH}.};
 : ${TARBALL_SIGN_GPG_KEY=};
-: ${TARBALL_SRC_FNAME_PREFIX:=midipix-src.};
+: ${TARBALL_SRC_FNAME_PREFIX:=midipix-${ARCH}.src.};
 : ${TARBALL_EXCLUDE_PATHS:="src tmp"};
 : ${TARBALL_SRC_SIGN_GPG_KEY=};
-: ${TARGET:=x86_64-nt64-midipix};
 : ${PREFIX_NATIVE:=${PREFIX}/native};
 : ${PREFIX_TARGET:=${PREFIX}/${TARGET}};
 : ${PREFIX_LVL0:=${PREFIX_TARGET}};
@@ -44,8 +51,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${WGET_ARGS:="-N --no-check-certificate"};
 : ${WORKDIR:=${PREFIX}/tmp};
 
-: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse irssi less libarchive libelf libfetch libffi libnbcompat libressl libz make mksh mpc mpfr nano ncurses ncursestw ncursesw ntapi ntcon ntctty openssh pacman patch pemagine perl popt psxscl psxstub psxtypes python3 rsync sed tar tcsh util_linux which xz zsh"};
-: ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE AUTOGEN BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_INSTALL SHA256SUM SUBDIR URL URL_FNAME URL_TYPE VERSION"};
+: ${PKG_BUILD_NAMES:="apk_tools bash binutils binutils_host bzip2 coreutils curl dalist dash diffutils findutils gawk git glib gmp grep gzip hexcurse irssi less libarchive libelf libfetch libffi libnbcompat libressl libz make mksh mpc mpfr nano ncurses ncursestw ncursesw ntapi ntcon ntctty openssh pacman patch pemagine perl popt psxscl psxstub psxtypes python3 rsync sed slibtool tar tcsh util_linux which xz zsh"};
+: ${PKG_BUILD_VARS:="AR_BUILD AR_CONFIGURE AUTOGEN BUILD_DIR BUILD_TYPE CC_BUILD CC_CONFIGURE CC_INSTALL CFLAGS_BUILD_EXTRA CFLAGS_CONFIGURE CFLAGS_CONFIGURE_EXTRA CFLAGS_INSTALL_EXTRA CONFIGURE_ARGS CONFIGURE_ARGS_EXTRA ENV_VARS_EXTRA FNAME GIT_ARGS_EXTRA INSTALL_TARGET LDFLAGS_BUILD_EXTRA LDFLAGS_CONFIGURE LDFLAGS_CONFIGURE_EXTRA LDFLAGS_INSTALL_EXTRA LIBFILES_FIX LIBTOOL_MIDIPIX LIBTOOL_MIDIPIX_FIX MAKEFLAGS_BUILD MAKEFLAGS_BUILD_EXTRA MAKEFLAGS_INSTALL MAKEFLAGS_INSTALL_EXTRA NO_CLEAN PATCHES_EXTRA_URL PREFIX_EXTRA RANLIB_INSTALL SHA256SUM SLIBTOOL SUBDIR URL URL_FNAME URL_TYPE VERSION"};
 : ${PKG_LVL0_CFLAGS_CONFIGURE:=-O0};
 : ${PKG_LVL0_CONFIGURE_ARGS:="-C --host=${HOST_NATIVE} --prefix= --target=${TARGET}"};
 : ${PKG_LVL0_MAKEFLAGS_BUILD:=${MAKEFLAGS_DEFAULT}};
@@ -94,11 +101,13 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_BINUTILS_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_VERSION}.tar.bz2};
 : ${PKG_BINUTILS_CONFIGURE_ARGS_EXTRA:=--with-libelf=${PREFIX_NATIVE} --with-gmp=${PREFIX_NATIVE} --with-mpc=${PREFIX_NATIVE} --with-mpfr=${PREFIX_NATIVE} --with-sysroot=/};
+: ${PKG_BINUTILS_SLIBTOOL:=slibtool-static};
 : ${PKG_BINUTILS_HOST_VERSION:=2.24.51};
 : ${PKG_BINUTILS_HOST_SHA256SUM:=250d3b2925c6b211fb16173b0b25bc091c58829fbcad3eb849645e0af52cf7fa};
 : ${PKG_BINUTILS_HOST_URL:=ftp://sourceware.org/pub/binutils/snapshots/binutils-${PKG_BINUTILS_VERSION}.tar.bz2};
 : ${PKG_BINUTILS_HOST_BUILD_TYPE:=cross};
 : ${PKG_BINUTILS_HOST_CONFIGURE_ARGS:=--disable-werror --prefix=${PREFIX} --target=${TARGET} --with-sysroot=${PREFIX_LVL0}};
+: ${PKG_BINUTILS_HOST_SLIBTOOL:=slibtool-static};
 : ${PKG_COREUTILS_VERSION:=8.23};
 : ${PKG_COREUTILS_SHA256SUM:=ec43ca5bcfc62242accb46b7f121f6b684ee21ecd7d075059bf650ff9e37b82d};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
@@ -135,7 +144,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_GIT_LDFLAGS_BUILD_EXTRA:=--sysroot=${PREFIX_LVL3}};
 : ${PKG_GIT_LDFLAGS_INSTALL_EXTRA:=--sysroot=${PREFIX_LVL3}};
 : ${PKG_GIT_LIBFILES_FIX:=1};
-: ${PKG_GIT_MAKEFLAGS_BUILD_EXTRA:=NO_EXPAT=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
+: ${PKG_GIT_MAKEFLAGS_BUILD_EXTRA:=NEEDS_SSL_WITH_CURL=1 NO_EXPAT=1 NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
 : ${PKG_GIT_MAKEFLAGS_INSTALL:=NO_PERL=1 prefix=${PREFIX_LVL3} V=99};
 : ${PKG_GIT_RANLIB_INSTALL:=${HOST_NATIVE}-ranlib};
 : ${PKG_GIT_SUBDIR:=git};
@@ -146,7 +155,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_GLIB_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz};
 : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:=--with-pcre=internal --disable-libelf};
 : ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_LVL3}/lib/libffi-3.2.1/include:LIBFFI_LIBS=-L${PREFIX_LVL3}/lib -lffi};
-: ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_GLIB_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_LVL3}/lib};
+: ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99 -j1};
 : ${PKG_GMP_VERSION:=5.1.3};
 : ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160};
 : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
@@ -279,7 +289,7 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_PACMAN_URL:=https://projects.archlinux.org/pacman.git/snapshot/pacman-${PKG_PACMAN_VERSION}.tar.gz};
 : ${PKG_PACMAN_AUTOGEN:=1};
 : ${PKG_PACMAN_CONFIGURE_ARGS_EXTRA:=--disable-doc};
-: ${PKG_PACMAN_ENV_VARS_EXTRA:="LIBARCHIVE_CFLAGS=:LIBARCHIVE_LIBS=:LIBSSL_CFLAGS=:LIBSSL_LIBS=:LIBCURL_CFLAGS=:LIBCURL_LIBS=:PKG_CONFIG_PATH=${PREFIX_LVL3}/lib/pkgconfig"};
+: ${PKG_PACMAN_ENV_VARS_EXTRA:="LIBALPM_LIBS=-lssl -lbz2 -llzma -lz:LIBARCHIVE_CFLAGS=:LIBARCHIVE_LIBS=:LIBSSL_CFLAGS=:LIBSSL_LIBS=:LIBCURL_CFLAGS=:LIBCURL_LIBS=:PKG_CONFIG_PATH=${PREFIX_LVL3}/lib/pkgconfig"};
 : ${PKG_PACMAN_MAKEFLAGS_BUILD_EXTRA:=V=99};
 : ${PKG_PATCH_VERSION:=2.7};
 : ${PKG_PATCH_SHA256SUM:=59c29f56faa0a924827e6a60c6accd6e2900eae5c6aaa922268c717f06a62048};
@@ -287,7 +297,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_PERL_VERSION:=5.22.1};
 : ${PKG_PERL_SHA256SUM:=2b475d0849d54c4250e9cba4241b7b7291cffb45dfd083b677ca7b5d38118f27};
 : ${PKG_PERL_URL:=http://www.cpan.org/src/5.0/perl-${PKG_PERL_VERSION}.tar.gz};
-: ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_LVL3}/include --sysroot=${PREFIX_LVL3} --target=x86_64-nt64-midipix"};
+: ${PKG_PERL_CONFIGURE_ARGS:="-A ccflags=-I${PREFIX_LVL3}/include --sysroot=${PREFIX_LVL3} --target=${TARGET}"};
+: ${PKG_PERL_ENV_VARS_EXTRA:="TARGET=${TARGET}"};
 : ${PKG_PERL_MAKEFLAGS_BUILD:=-j1};
 : ${PKG_PYTHON3_VERSION:=3.5.1};
 : ${PKG_PYTHON3_SHA256SUM:=687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7};
@@ -299,6 +310,9 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_RSYNC_SHA256SUM:=ecfa62a7fa3c4c18b9eccd8c16eaddee4bd308a76ea50b5c02a5840f09c0a1c2};
 : ${PKG_RSYNC_URL:=https://download.samba.org/pub/rsync/src/rsync-${PKG_RSYNC_VERSION}.tar.gz};
 : ${PKG_RSYNC_CONFIGURE_ARGS_EXTRA:=--with-included-popt --with-included-zlib};
+: ${PKG_SLIBTOOL_URL:=git://midipix.org/slibtool};
+: ${PKG_SLIBTOOL_URL_TYPE:=git};
+: ${PKG_SLIBTOOL_CONFIGURE_ARGS:=--host= --prefix=${PREFIX}};
 : ${PKG_TAR_VERSION:=1.28};
 : ${PKG_TAR_SHA256SUM:=6a6b65bac00a127a508533c604d5bf1a3d40f82707d56f20cefd38a05e8237de};
 : ${PKG_TAR_URL:=https://ftp.gnu.org/gnu/tar/tar-${PKG_TAR_VERSION}.tar.gz};