subr/pkg_install.subr:pkgp_install_dlltool(): va-yehi ken.

subr/build.subr:build_fileop(): include -L when testing pathnames for existence.
vars/build.vars: adds `host_packages' target comprised of all host packages.
vars/build.vars:lib_packages: adds w32lib (via Redfoxmoon.)

3 files changed, 126 insertions, 102 deletions

diff --git a/subr/build.subr b/subr/build.subr
index 0e5bea4e..14c932e2 100644
--- a/subr/build.subr
+++ b/subr/build.subr
@@ -2,7 +2,9 @@
 # set -o errexit -o noglob are assumed.
 #
 
+basename() { echo "${1##*/}"; };
 date() { command date "+${1:-${TIMESTAMP_FMT}}"; };
+dirname() { echo "${1%/*}"; };
 get_var_unsafe() { eval echo \${${1}}; };
 set_var_unsafe() { [ -n "${2}" ] && eval ${1}=\"${2}\" || return 0; };
 pop_IFS() { IFS="${_pI_IFS}"; unset _pI_IFS; };
@@ -14,7 +16,7 @@ build_fileop() {
 	local _op="${1}"; shift;
 	if [ "${_op}" = cd ]; then
 		log_msg varn "Changing working directory to \`${1}'.";
-		[ \( -n "${1}" \) -a \( -e "${1}" \) ] && cd -- "${1}";
+		[ \( -n "${1}" \) -a \( -L "${1}" -o -e "${1}" \) ] && cd -- "${1}";
 	elif [ "${_op}" = cp ]; then
 		log_msg varn "Copying \`${1}' to \`${2}' w/ -pPR.";
 		[ ${#} -ge 2 ] && cp -pPR -- "${@}";
@@ -34,7 +36,7 @@ build_fileop() {
 				log_msg varn "Making directory \`${1}'.";
 				mkdir -p -- "${1}";
 			elif [ "${_op}" = rm ]\
-			&&   [ -e "${1}" ]; then
+			&&   [ \( -L "${1}" \) -o \( -e "${1}" \) ]; then
 				log_msg varn "Removing directory or file \`${1}'.";
 				rm -rf -- "${1}";
 			fi; shift;
diff --git a/subr/pkg_install.subr b/subr/pkg_install.subr
index 35dd5d42..fc76098e 100644
--- a/subr/pkg_install.subr
+++ b/subr/pkg_install.subr
@@ -11,34 +11,56 @@ pkgp_install_clean_lib() {
 	fi;
 };
 
-pkgp_install_dlltool() {
-	local _so_fname _so_name;
+pkgp_install_lib_link() {
+	local _so_path="${1}" _so_dir="${2}" _lib_name="${3}"				\
+		_lib_link_tgt _lib_link_path;
+	_lib_link_tgt="$(find "${_so_dir}"						\
+			-name "${_lib_name%%.*}.*.lib.a"				|\
+			sort | tail -1)";
+	if [ -n "${_lib_link_tgt}" ]; then
+		_lib_link_path="${_so_path%.so*}.lib.a";
+		build_fileop rm "${_lib_link_path}";
+		build_fileop ln_symbolic "${_lib_link_tgt}"				\
+			"${_lib_link_path}";
+	fi;
+};
+
+pkgp_install_libs() {
+	local _so_src_path _so_dst_path _so_dst_dir					\
+		_lib_src_path _lib_name _lib_dst_path;
 	if [ "${PKG_BUILD_TYPE}" != "host" ]						\
 	&& test_cmd perk								\
 	&& test_cmd ${PKG_TARGET}-mdso; then
-		for _so_fname in							\
+		for _so_src_path in							\
 			$(find	\(  -name "*.so"					\
 				-or -name "*.so.[0-9]*"					\
 				-or -name "*.so.[0-9]*.[0-9]*"				\
 				-or -name "*.so.[0-9]*.[0-9]*.[0-9]*" \) -print);
-		do	_so_fname="${_so_fname#./}";
-			case "${_so_fname}" in
-			*.so)		_so_fname_ver=""; ;;
-			*.so.*)		_so_fname_ver="${_so_fname##*.so.}"; ;;
-			esac;
-			_so_name="${_so_fname%%.so*}";
-			_lib_fname="${_so_name}${_so_fname_ver:+.${_so_fname_ver}}.lib.a";
-			if [ -e "${_lib_fname}" ]					\
-			|| [ -e "${PKG_PREFIX}/lib/${_lib_fname}" ]			\
-			|| [ "$(readlink -f "${_so_fname}")" = "/dev/null" ]; then
+		do	_so_src_path="${_so_src_path#./}";
+			if [ "$(readlink -f "${_so_src_path}")" = "/dev/null" ]; then
+				continue;
+			else	case "${_so_src_path}" in
+				*.so)	_lib_src_path="${_so_src_path%%.so}.lib.a"; ;;
+				*.so.*)	_lib_src_path="${_so_src_path%%.so.*}.${_so_src_path##*.so.}.lib.a"; ;;
+				esac;
+				_lib_name="$(basename "${_lib_src_path}")";
+				_so_dst_path="$(find "${PKG_PREFIX}/lib"		\
+						-name "$(basename "${_so_src_path}")"	\
+						-size "$(stat -c %s "${_so_src_path}")c")";
+				_so_dst_dir="${_so_dst_path%/*}";
+			fi;
+			if [ -z "${_so_dst_path}" ]; then
 				continue;
-			else
-				echo perk -e "${_so_fname}"				\|\
-					${PKG_TARGET}-mdso -i ${_lib_fname} -n "${_so_fname##*/}" -
-				perk -e "${_so_fname}"					|\
-					${PKG_TARGET}-mdso -i ${_lib_fname} -n "${_so_fname##*/}" -
-				build_fileop cp "${_lib_fname}" "${PKG_PREFIX}/lib";
+			elif [ ! -L "${_lib_src_path}" ]; then
+				_lib_dst_path="${_so_dst_dir}/${_lib_name}";
+				perk -e "${_so_src_path}"				|\
+					"${PKG_TARGET}-mdso"				\
+						-i "${_lib_src_path}"			\
+						-n "${_so_src_path}" -;
+				build_fileop rm "${_lib_dst_path}";
+				build_fileop cp "${_lib_src_path}" "${_lib_dst_path}";
 			fi;
+			pkgp_install_lib_link "${_so_dst_path}" "${_so_dst_dir}" "${_lib_name}";
 		done;
 	fi;
 };
@@ -48,7 +70,7 @@ pkgp_install_pkgconfig() {
 	for __ in $(find "${WORKDIR}/${PKG_BUILD_DIR}" -name \*.pc); do 
 		if grep -Eq '^libdir=[^$]+$' "${__}"; then
 			sed -i	-e '/^libdir=[^$]\+$/s/^libdir=\(.\+\)$/libdir=${exec_prefix}\1/'	\
-				-e '/^exec_prefix=$/s/^.*$/exec_prefix=${prefix}/'			\
+				-e '/^exec_prefix=$/s/^.*$/exec_prefix=${prefix}/'	\
 					"${__}";
 		fi;
 	done;
@@ -85,7 +107,7 @@ pkg_install() {
 	if [ -n "${PKG_INSTALL_FILES}" ]; then
 		(install_files -v ${PKG_PREFIX} ${PKG_INSTALL_FILES});
 	fi;
-	pkgp_install_dlltool;
+	pkgp_install_libs;
 	pkgp_install_pkgconfig;
 };
 
diff --git a/vars/build.vars b/vars/build.vars
index dd18061d..5d611323 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -19,6 +19,7 @@ if [ "${BUILD:=debug}" = debug ]; then
 	HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 	NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 	RUNTIME_CFLAGS_CONFIGURE_DEFAULT="-g3 -O0";
+	HOST_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 	LEAF_PACKAGES_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
 	MINIPIX_CFLAGS_CONFIGURE_DEFAULT="-g2 -O0";
@@ -26,6 +27,7 @@ elif [ "${BUILD}" = release ]; then
 	HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
 	RUNTIME_CFLAGS_CONFIGURE_DEFAULT="-g0 -O2";
+	HOST_PACKAGES_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";
@@ -90,7 +92,10 @@ INVARIANTS_PACKAGES="chainport";
 HOST_TOOLCHAIN_BUILD_TYPE="host";
 HOST_TOOLCHAIN_CFLAGS_CONFIGURE="${HOST_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT}";
 HOST_TOOLCHAIN_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --target=${TARGET}";
-HOST_TOOLCHAIN_PACKAGES="slibtool_host perk_host mdso_host binutils_host binutils_host_x86_64_w64_mingw32 gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1 psxstub musl_no_complex gcc_runtime musl_full gcc_libstdcpp_v3 gcc_full file_host infozip_host infounzip_host install_strip_host psxtypes_host ldso_host pkgconf_host";
+HOST_TOOLCHAIN_PACKAGES="
+slibtool_host perk_host mdso_host binutils_host binutils_host_x86_64_w64_mingw32
+gcc_stage1_cross_x86_64_w64_mingw32 gcc_stage1 psxstub musl_no_complex gcc_runtime
+musl_full gcc_libstdcpp_v3 gcc_full install_strip_host psxtypes_host ldso_host pkgconf_host";
 HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${GITROOT}/slibtool"};
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--host= --prefix=};
@@ -130,18 +135,6 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_MUSL_FULL_VERSION:=1.1.12};
 : ${PKG_GCC_LIBSTDCPP_V3_VERSION:=4.6.4};
 : ${PKG_GCC_FULL_VERSION:=4.6.4};
-: ${PKG_FILE_HOST_SHA256SUM:=8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50};
-: ${PKG_FILE_HOST_VERSION:=5.32};
-: ${PKG_FILE_HOST_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz};
-: ${PKG_FILE_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX}"};
-: ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master};
-: ${PKG_INFOZIP_HOST_MAKEFLAGS_INSTALL_EXTRA:=DESTDIR=${PREFIX}};
-: ${PKG_INFOZIP_HOST_BUILD_DIR:=infozip-host};
-: ${PKG_INFOZIP_HOST_SUBDIR:=infozip-host};
-: ${PKG_INFOUNZIP_HOST_URLS_GIT:=infounzip-host=https://github.com/Redfoxmoon3/infounzip.git@master};
-: ${PKG_INFOUNZIP_HOST_MAKEFLAGS_INSTALL_EXTRA:=DESTDIR=${PREFIX}};
-: ${PKG_INFOUNZIP_HOST_BUILD_DIR:=infounzip-host};
-: ${PKG_INFOUNZIP_HOST_SUBDIR:=infounzip-host};
 : ${PKG_INSTALL_STRIP_HOST_BUILD_STEPS:="setup_env:always install:main"};
 : ${PKG_INSTALL_STRIP_HOST_URL:=none};
 : ${PKG_PSXTYPES_HOST_URLS_GIT:=psxtypes=${GITROOT}/psxtypes};
@@ -157,11 +150,11 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 : ${PKG_LDSO_HOST_MAKEFLAGS_BUILD_EXTRA:=STATIC_LIB_NAME=libldso.a};
 : ${PKG_LDSO_HOST_MAKEFLAGS_INSTALL_EXTRA:="DESTDIR=${PREFIX_CROSS} STATIC_LIB_NAME=libldso.a"};
 : ${PKG_LDSO_HOST_SUBDIR:=pemagine};
+: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX_NATIVE}"};
+: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=${PREFIX}};
 : ${PKG_PKGCONF_HOST_SHA256SUM:=7ec8b516e655e247f4ba976837cee808134785819ab8f538f652fe919cc6c09f};
 : ${PKG_PKGCONF_HOST_VERSION:=0.9.12};
 : ${PKG_PKGCONF_HOST_URL:=https://github.com/pkgconf/pkgconf/releases/download/pkgconf-${PKG_PKGCONF_HOST_VERSION}/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.bz2};
-: ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX_NATIVE}"};
-: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=${PREFIX}};
 
 #
 # Build target native_toolchain
@@ -169,7 +162,9 @@ HOST_TOOLCHAIN_PREFIX="${PREFIX_CROSS}";
 NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE="${NATIVE_TOOLCHAIN_CFLAGS_CONFIGURE_DEFAULT}";
 NATIVE_TOOLCHAIN_CONFIGURE_ARGS="--disable-nls --host=${TARGET} --prefix=/ --target=${TARGET}";
 NATIVE_TOOLCHAIN_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
-NATIVE_TOOLCHAIN_PACKAGES="slibtool perk pkgconf gmp mpfr mpc libelf binutils binutils_x86_64_w64_mingw32 musl_native gcc_native gcc_stage1_native_x86_64_w64_mingw32 mdso";
+NATIVE_TOOLCHAIN_PACKAGES="
+slibtool perk pkgconf gmp mpfr mpc libelf binutils binutils_x86_64_w64_mingw32
+musl_native gcc_native gcc_stage1_native_x86_64_w64_mingw32 mdso";
 NATIVE_TOOLCHAIN_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_SLIBTOOL_URLS_GIT:="slibtool=git://midipix.org/slibtool"};
 : ${PKG_SLIBTOOL_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET}"};
@@ -281,6 +276,65 @@ RUNTIME_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_U16PORTS_SUBDIR:=u16ports};
 
 #
+# Build target host_packages
+#
+HOST_PACKAGES_BUILD_TYPE="host";
+HOST_PACKAGES_CFLAGS_CONFIGURE="${HOST_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${HOST_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }";
+HOST_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --prefix=${PREFIX}";
+HOST_PACKAGES_LDFLAGS_CONFIGURE="";
+HOST_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX}";
+HOST_PACKAGES_PACKAGES="
+cmake_host llvm_host clang_host file_host glib_host infounzip_host infozip_host
+intltool_host libffi_host ruby_host";
+: ${PKG_CMAKE_HOST_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe};
+: ${PKG_CMAKE_HOST_VERSION:=3.6.3};
+: ${PKG_CMAKE_HOST_URL:=https://cmake.org/files/v${PKG_CMAKE_HOST_VERSION%.*}/cmake-${PKG_CMAKE_HOST_VERSION}.tar.gz};
+: ${PKG_CMAKE_HOST_CONFIGURE_ARGS:="--parallel=${BUILD_CPUS} --prefix=${PREFIX}"};
+: ${PKG_CMAKE_HOST_MAKEFLAGS_INSTALL:=};
+: ${PKG_LLVM_HOST_SHA256SUM:=6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9};
+: ${PKG_LLVM_HOST_VERSION:=3.8.1};
+: ${PKG_LLVM_HOST_URL:=http://releases.llvm.org/${PKG_LLVM_HOST_VERSION}/llvm-${PKG_LLVM_HOST_VERSION}.src.tar.xz};
+: ${PKG_CLANG_HOST_SHA256SUM:=4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf};
+: ${PKG_CLANG_HOST_VERSION:=3.8.1};
+: ${PKG_CLANG_HOST_URL:=http://releases.llvm.org/${PKG_CLANG_HOST_VERSION}/cfe-${PKG_CLANG_HOST_VERSION}.src.tar.xz};
+: ${PKG_FILE_HOST_SHA256SUM:=8639dc4d1b21e232285cd483604afc4a6ee810710e00e579dbe9591681722b50};
+: ${PKG_FILE_HOST_VERSION:=5.32};
+: ${PKG_FILE_HOST_URL:=ftp://ftp.astron.com/pub/file/file-${PKG_FILE_HOST_VERSION}.tar.gz};
+: ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount --program-prefix="};
+: ${PKG_GLIB_HOST_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib -lffi};
+: ${PKG_GLIB_HOST_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_GLIB_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
+: ${PKG_GLIB_HOST_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a};
+: ${PKG_GLIB_HOST_VERSION:=2.54.0};
+: ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz};
+: ${PKG_INFOUNZIP_HOST_BUILD_DIR:=infounzip-host};
+: ${PKG_INFOUNZIP_HOST_SUBDIR:=infounzip-host};
+: ${PKG_INFOUNZIP_HOST_URLS_GIT:=infounzip-host=https://github.com/Redfoxmoon3/infounzip.git@master};
+: ${PKG_INFOZIP_HOST_BUILD_DIR:=infozip-host};
+: ${PKG_INFOZIP_HOST_SUBDIR:=infozip-host};
+: ${PKG_INFOZIP_HOST_URLS_GIT:=infozip-host=https://github.com/Redfoxmoon3/infozip.git@master};
+: ${PKG_INTLTOOL_HOST_BUILD_TYPE:=host};
+: ${PKG_INTLTOOL_HOST_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_INTLTOOL_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
+: ${PKG_INTLTOOL_HOST_SHA256SUM:=67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd};
+: ${PKG_INTLTOOL_HOST_VERSION:=0.51.0};
+: ${PKG_INTLTOOL_HOST_URL:=https://launchpad.net/intltool/trunk/${PKG_INTLTOOL_HOST_VERSION}/+download/intltool-${PKG_INTLTOOL_HOST_VERSION}.tar.gz};
+: ${PKG_LIBFFI_HOST_BUILD_TYPE:=host};
+: ${PKG_LIBFFI_HOST_CONFIGURE_ARGS_EXTRA:="--program-prefix="};
+: ${PKG_LIBFFI_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
+: ${PKG_LIBFFI_HOST_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
+: ${PKG_LIBFFI_HOST_VERSION:=3.2.1};
+: ${PKG_LIBFFI_HOST_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_HOST_VERSION}.tar.gz};
+: ${PKG_RUBY_HOST_BUILD_STEPS:="setup_env:always all:abstract disabled:always fetch:main extract:main patch_pre:main distclean:main build_dir:always autoconf:main configure:main clean:optional build:main install_pre:main install:main strip:main finish:always"};
+: ${PKG_RUBY_HOST_CFLAGS_CONFIGURE_DEBUG:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"};
+: ${PKG_RUBY_HOST_CFLAGS_CONFIGURE_RELEASE:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"-O1};
+: ${PKG_RUBY_HOST_CONFIGURE_ARGS_EXTRA:="--disable-install-rdoc --with-out-ext=fiddle"};
+: ${PKG_RUBY_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
+: ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
+: ${PKG_RUBY_HOST_VERSION:=2.3.0};
+: ${PKG_RUBY_HOST_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_HOST_VERSION%.*}/ruby-${PKG_RUBY_HOST_VERSION}.tar.gz};
+
+#
 # Build target lib_packages
 #
 LIB_PACKAGES_CFLAGS_CONFIGURE="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }--sysroot=${PREFIX_NATIVE}";
@@ -289,20 +343,16 @@ LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LIB_PACKAGES_PACKAGES_LEAVES="
 expat libxml2 alsa_lib apr apr_util bzip2 curl libz lmdb libpng libjpeg_turbo tiff giflib
-libffi gdbm geoip pcre libffi_host glib_host glib gzip intltool_host libarchive libatomic_ops
+libffi gdbm geoip pcre glib gzip libarchive libatomic_ops
 libpipeline libressl libevent libfetch libgpg_error libassuan libfirm libgcrypt
-libksba libudns lua ncurses ncursestw ncursesw npth popt ruby_host
-shared_mime_info sqlite3 xz w32api";
+libksba libudns lua ncurses ncursestw ncursesw npth popt shared_mime_info sqlite3 xz w32api w32lib";
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto fixesproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext freetype fontconfig renderproto Xrender libXft libXfixes libXi libICE libSM libXt libXmu libXpm
 libXaw libxkbfile pixman cairo dbus pango atk gdk gtk2 imlib2 libcaca";
-LIB_PACKAGES_PACKAGES_LIBS="
-cmake llvm_host";
 LIB_PACKAGES_PACKAGES="
 	${LIB_PACKAGES_PACKAGES_LEAVES}
-	${LIB_PACKAGES_PACKAGES_X11}
-	${LIB_PACKAGES_PACKAGES_LIBS}";
+	${LIB_PACKAGES_PACKAGES_X11}";
 LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_EXPAT_SHA256SUM:=d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff};
 : ${PKG_EXPAT_VERSION:=2.2.0};
@@ -366,24 +416,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PCRE_SHA256SUM:=244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c};
 : ${PKG_PCRE_VERSION:=8.41};
 : ${PKG_PCRE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PKG_PCRE_VERSION}.tar.gz};
-: ${PKG_LIBFFI_HOST_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
-: ${PKG_LIBFFI_HOST_VERSION:=3.2.1};
-: ${PKG_LIBFFI_HOST_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_HOST_VERSION}.tar.gz};
-: ${PKG_LIBFFI_HOST_BUILD_TYPE:=host};
-: ${PKG_LIBFFI_HOST_CFLAGS_CONFIGURE:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"};
-: ${PKG_LIBFFI_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -L${PREFIX}/lib64"};
-: ${PKG_LIBFFI_HOST_CONFIGURE_ARGS:="-C --disable-nls --prefix=${PREFIX} --program-prefix="};
-: ${PKG_LIBFFI_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
-: ${PKG_GLIB_HOST_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a};
-: ${PKG_GLIB_HOST_VERSION:=2.54.0};
-: ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz};
-: ${PKG_GLIB_HOST_BUILD_TYPE:=host};
-: ${PKG_GLIB_HOST_CFLAGS_CONFIGURE:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"};
-: ${PKG_GLIB_HOST_CONFIGURE_ARGS:="-C --disable-dtrace --disable-libelf --disable-libmount --disable-nls --prefix=${PREFIX} --program-prefix="};
-: ${PKG_GLIB_HOST_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib -lffi};
-: ${PKG_GLIB_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -L${PREFIX}/lib64"};
-: ${PKG_GLIB_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
-: ${PKG_GLIB_HOST_MAKEFLAGS_BUILD_EXTRA:=V=99};
 : ${PKG_GLIB_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a};
 : ${PKG_GLIB_VERSION:=2.54.0};
 : ${PKG_GLIB_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz};
@@ -398,15 +430,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_INTLTOOL_HOST_SHA256SUM:=67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd};
-: ${PKG_INTLTOOL_HOST_VERSION:=0.51.0};
-: ${PKG_INTLTOOL_HOST_URL:=https://launchpad.net/intltool/trunk/${PKG_INTLTOOL_HOST_VERSION}/+download/intltool-${PKG_INTLTOOL_HOST_VERSION}.tar.gz};
-: ${PKG_INTLTOOL_HOST_BUILD_TYPE:=host};
-: ${PKG_INTLTOOL_HOST_CFLAGS_CONFIGURE:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"};
-: ${PKG_INTLTOOL_HOST_CONFIGURE_ARGS:="-C --prefix=${PREFIX}"};
-: ${PKG_INTLTOOL_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -L${PREFIX}/lib64"};
-: ${PKG_INTLTOOL_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
-: ${PKG_INTLTOOL_HOST_MAKEFLAGS_BUILD_EXTRA:=V=99};
 : ${PKG_LIBARCHIVE_SHA256SUM:=691c194ee132d1f0f7a42541f091db811bc2e56f7107e9121be2bc8c04f1060f};
 : ${PKG_LIBARCHIVE_VERSION:=3.2.2};
 : ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz};
@@ -488,16 +511,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_POPT_SHA256SUM:=e728ed296fe9f069a0e005003c3d6b2dde3d9cad453422a10d6558616d304cc8};
 : ${PKG_POPT_VERSION:=1.16};
 : ${PKG_POPT_URL:=http://rpm5.org/files/popt/popt-${PKG_POPT_VERSION}.tar.gz};
-: ${PKG_RUBY_HOST_SHA256SUM:=ba5ba60e5f1aa21b4ef8e9bf35b9ddb57286cb546aac4b5a28c71f459467e507};
-: ${PKG_RUBY_HOST_VERSION:=2.3.0};
-: ${PKG_RUBY_HOST_URL:=https://cache.ruby-lang.org/pub/ruby/${PKG_RUBY_HOST_VERSION%.*}/ruby-${PKG_RUBY_HOST_VERSION}.tar.gz};
-: ${PKG_RUBY_HOST_BUILD_STEPS:="setup_env:always all:abstract disabled:always fetch:main extract:main patch_pre:main distclean:main build_dir:always autoconf:main configure:main clean:optional build:main install_pre:main install:main strip:main finish:always"};
-: ${PKG_RUBY_HOST_BUILD_TYPE:=host};
-: ${PKG_RUBY_HOST_CFLAGS_CONFIGURE_DEBUG:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"};
-: ${PKG_RUBY_HOST_CFLAGS_CONFIGURE_RELEASE:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"-O1};
-: ${PKG_RUBY_HOST_LDFLAGS_CONFIGURE:="-L${PREFIX}/lib -L${PREFIX}/lib64"};
-: ${PKG_RUBY_HOST_CONFIGURE_ARGS:="-C --disable-nls --disable-install-rdoc --prefix=${PREFIX} --with-out-ext=fiddle"};
-: ${PKG_RUBY_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
 : ${PKG_SHARED_MIME_INFO_SHA256SUM:=2af55ef1a0319805b74ab40d331a3962c905477d76c086f49e34dc96363589e9};
 : ${PKG_SHARED_MIME_INFO_VERSION:=1.8};
 : ${PKG_SHARED_MIME_INFO_URL:=http://freedesktop.org/~hadess/shared-mime-info-${PKG_SHARED_MIME_INFO_VERSION}.tar.xz};
@@ -518,6 +531,9 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_W32API_MAKEFLAGS_BUILD:="DESTDIR=${PREFIX_NATIVE}"};
 : ${PKG_W32API_MAKEFLAGS_INSTALL:="DESTDIR=${PREFIX_NATIVE}"};
 : ${PKG_W32API_SUBDIR:=w32api};
+: ${PKG_W32LIB_URLS_GIT:="w32lib=git://git.midipix.org/w32lib"};
+: ${PKG_W32LIB_SUBDIR:=w32lib};
+: ${PKG_W32LIB_CONFIGURE_ARGS:="--host=${TARGET} --prefix= --target=${TARGET}"};
 
 : ${PKG_XZ_SHA256SUM:=73df4d5d34f0468bd57d09f2d8af363e95ed6cc3a4a86129d2f2c366259902a2};
 : ${PKG_XZ_VERSION:=5.2.2};
@@ -648,17 +664,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBCACA_LDFLAGS_BUILD_EXTRA:="-L${PREFIX_NATIVE}/lib -lImlib2"};
 : ${PKG_LIBCACA_SUBDIR:=libcaca};
 
-: ${PKG_CMAKE_SHA256SUM:=7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe};
-: ${PKG_CMAKE_VERSION:=3.6.3};
-: ${PKG_CMAKE_URL:=https://cmake.org/files/v${PKG_CMAKE_VERSION%.*}/cmake-${PKG_CMAKE_VERSION}.tar.gz};
-: ${PKG_CMAKE_CONFIGURE_ARGS:="--parallel=${BUILD_CPUS} --prefix="};
-: ${PKG_CMAKE_MAKEFLAGS_INSTALL:=};
-: ${PKG_LLVM_HOST_SHA256SUM:=6e82ce4adb54ff3afc18053d6981b6aed1406751b8742582ed50f04b5ab475f9};
-: ${PKG_LLVM_HOST_VERSION:=3.8.1};
-: ${PKG_LLVM_HOST_URL:=http://releases.llvm.org/${PKG_LLVM_HOST_VERSION}/llvm-${PKG_LLVM_HOST_VERSION}.src.tar.xz};
-: ${PKG_LLVM_HOST_BUILD_TYPE:=host};
-: ${PKG_LLVM_HOST_MAKEFLAGS_INSTALL:=DESTDIR=${PREFIX}};
-
 #
 # Build target dev_packages
 #
@@ -678,7 +683,7 @@ 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 aria2 bash bc bdwgc bind bison chicken clang_host coreutils cparser cron dash datamash diffutils
+apk_tools aria2 bash bc bdwgc bind bison chicken coreutils cparser cron dash datamash diffutils
 dos2unix dropbear ed figlet file findutils gawk git gnupg grep hexcurse htop inetutils infounzip infozip
 irssi john ldns less lighttpd flex lunix lynx make man_db mc mksh mtr m4 nano ncdu nginx openlitespeed openssh p7zip
 pacman patch patchutils perl procps_ng python3 qpdf rsync ruby rxvt_unicode sbase sed smallbasic socat st tar tcsh
@@ -719,11 +724,6 @@ LEAF_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CHICKEN_MAKEFLAGS_BUILD_EXTRA_RELEASE:=DEBUGBUILD=0};
 : ${PKG_CHICKEN_MAKEFLAGS_INSTALL:="PLATFORM=midipix-${ARCH} PREFIX=${PREFIX_NATIVE} TARGET_PREFIX=${PREFIX_NATIVE} C_COMPILER=${TARGET}-gcc HOSTSYSTEM=${TARGET} CROSS_CHICKEN=1"};
 : ${PKG_CHICKEN_NO_CLEAN:=1};
-: ${PKG_CLANG_HOST_SHA256SUM:=4cd3836dfb4b88b597e075341cae86d61c63ce3963e45c7fe6a8bf59bb382cdf};
-: ${PKG_CLANG_HOST_VERSION:=3.8.1};
-: ${PKG_CLANG_HOST_URL:=http://releases.llvm.org/${PKG_CLANG_HOST_VERSION}/cfe-${PKG_CLANG_HOST_VERSION}.src.tar.xz};
-: ${PKG_CLANG_HOST_BUILD_TYPE:=host};
-: ${PKG_CLANG_HOST_MAKEFLAGS_INSTALL:=DESTDIR=${PREFIX}};
 : ${PKG_COREUTILS_SHA256SUM:=1117b1a16039ddd84d51a9923948307cfa28c2cea03d1a2438742253df0a0c65};
 : ${PKG_COREUTILS_VERSION:=8.28};
 : ${PKG_COREUTILS_URL:=https://ftp.gnu.org/gnu/coreutils/coreutils-${PKG_COREUTILS_VERSION}.tar.xz};
@@ -1119,7 +1119,7 @@ MINIPIX_PREFIX="${PREFIX_MINIPIX}";
 #
 DEVROOT_PACKAGES="host_toolchain native_toolchain runtime";
 DEV_PACKAGES="host_toolchain native_toolchain runtime dev_packages";
-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 dev world";
+WORLD_PACKAGES="host_toolchain native_toolchain runtime host_packages lib_packages leaf_packages minipix";
+ALL_TARGETS="host_toolchain native_toolchain runtime host_packages lib_packages leaf_packages minipix devroot dev world";
 
 # vim:filetype=sh textwidth=0