vars/build.vars:host_tools:${PKG_CONFIGURE_ARGS}: configure w/ --disable-nls --prefix=${PREFIX}.

vars/build.vars:host_tools:${PKG_MAKEFLAGS_INSTALL}: install w/ PREFIX= prefix=.
vars/build.vars:{bison,flex}_host: moved into host_tools.

1 files changed, 11 insertions, 17 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 7eacc32e..74f5cfe3 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -148,9 +148,11 @@ gl_cv_C_locale_sans_EILSEQ=yes"};
 # Build group host_tools
 #
 HOST_TOOLS_BUILD_TYPE="host";
-HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
+HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}";
+HOST_TOOLS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 HOST_TOOLS_PACKAGES="
-slibtool_host mdso_host perk_host pkgconf_host m4_host autoconf_host automake_host libtool_host";
+slibtool_host mdso_host perk_host pkgconf_host m4_host autoconf_host
+automake_host libtool_host bison_host flex_host";
 HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_SLIBTOOL_HOST_URLS_GIT:="slibtool=${DEFAULT_GITROOT}/slibtool"};
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--prefix=};
@@ -165,25 +167,24 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_PKGCONF_HOST_VERSION:=1.6.3};
 : ${PKG_PKGCONF_HOST_URL:=https://distfiles.dereferenced.org/pkgconf/pkgconf-${PKG_PKGCONF_HOST_VERSION}.tar.xz};
 : ${PKG_PKGCONF_HOST_CONFIGURE_ARGS:="--prefix=${PREFIX} --with-system-libdir=${PREFIX_NATIVE}/lib --with-system-includedir=${PREFIX_NATIVE}/include --with-pkg-config-dir=${PREFIX_NATIVE}/lib/pkgconfig --with-personality-dir=${PREFIX_NATIVE}/share/pkgconfig/personality.d"};
-: ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
 : ${PKG_M4_HOST_SHA256SUM:=f2c1e86ca0a404ff281631bdc8377638992744b175afb806e25871a24a934e07};
 : ${PKG_M4_HOST_VERSION:=1.4.18};
 : ${PKG_M4_HOST_URL:=https://ftp.gnu.org/gnu/m4/m4-${PKG_M4_HOST_VERSION}.tar.xz};
 : ${PKG_AUTOCONF_HOST_SHA256SUM:=64ebcec9f8ac5b2487125a86a7760d2591ac9e1d3dbd59489633f9de62a57684};
 : ${PKG_AUTOCONF_HOST_VERSION:=2.69};
 : ${PKG_AUTOCONF_HOST_URL:=https://ftp.gnu.org/gnu/autoconf/autoconf-${PKG_AUTOCONF_HOST_VERSION}.tar.xz};
-: ${PKG_AUTOCONF_HOST_CONFIGURE_ARGS:="-disable-nls --prefix=${PREFIX} --target=${DEFAULT_TARGET}"};
-: ${PKG_AUTOCONF_HOST_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
 : ${PKG_AUTOMAKE_HOST_SHA256SUM:=5d05bb38a23fd3312b10aea93840feec685bdf4a41146e78882848165d3ae921};
 : ${PKG_AUTOMAKE_HOST_VERSION:=1.16.1};
 : ${PKG_AUTOMAKE_HOST_URL:=https://ftp.gnu.org/gnu/automake/automake-${PKG_AUTOMAKE_HOST_VERSION}.tar.xz};
-: ${PKG_AUTOMAKE_HOST_CONFIGURE_ARGS:="-disable-nls --prefix=${PREFIX} --target=${DEFAULT_TARGET}"};
-: ${PKG_AUTOMAKE_HOST_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
 : ${PKG_LIBTOOL_HOST_SHA256SUM:=7c87a8c2c8c0fc9cd5019e402bed4292462d00a718a7cd5f11218153bf28b26f};
 : ${PKG_LIBTOOL_HOST_VERSION:=2.4.6};
 : ${PKG_LIBTOOL_HOST_URL:=https://ftp.gnu.org/gnu/libtool/libtool-${PKG_LIBTOOL_HOST_VERSION}.tar.xz};
-: ${PKG_LIBTOOL_HOST_CONFIGURE_ARGS:="--prefix=${PREFIX}"};
-: ${PKG_LIBTOOL_HOST_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
+: ${PKG_BISON_HOST_SHA256SUM:=55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641};
+: ${PKG_BISON_HOST_VERSION:=3.5};
+: ${PKG_BISON_HOST_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_HOST_VERSION}.tar.xz};
+: ${PKG_FLEX_HOST_SHA256SUM:=68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa};
+: ${PKG_FLEX_HOST_VERSION:=2.6.3};
+: ${PKG_FLEX_HOST_URL:=https://github.com/westes/flex/releases/download/v${PKG_FLEX_HOST_VERSION}/flex-${PKG_FLEX_HOST_VERSION}.tar.gz};
 
 #
 # Build group host_deps
@@ -192,8 +193,7 @@ HOST_DEPS_BUILD_TYPE="host";
 HOST_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}";
 HOST_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 HOST_DEPS_PACKAGES="
-bmake_host bzip2_host file_host bison_host flex_host install_strip_host
-libz_host mpackage_host sqlite3_host texinfo_host";
+bmake_host bzip2_host file_host install_strip_host libz_host mpackage_host sqlite3_host texinfo_host";
 HOST_DEPS_PARALLELISE=1;
 HOST_DEPS_PREFIX="${PREFIX}";
 : ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
@@ -207,12 +207,6 @@ HOST_DEPS_PREFIX="${PREFIX}";
 : ${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_BISON_HOST_SHA256SUM:=55e4a023b1b4ad19095a5f8279f0dc048fa29f970759cea83224a6d5e7a3a641};
-: ${PKG_BISON_HOST_VERSION:=3.5};
-: ${PKG_BISON_HOST_URL:=https://ftp.gnu.org/gnu/bison/bison-${PKG_BISON_HOST_VERSION}.tar.xz};
-: ${PKG_FLEX_HOST_SHA256SUM:=68b2742233e747c462f781462a2a1e299dc6207401dac8f0bbb316f48565c2aa};
-: ${PKG_FLEX_HOST_VERSION:=2.6.3};
-: ${PKG_FLEX_HOST_URL:=https://github.com/westes/flex/releases/download/v${PKG_FLEX_HOST_VERSION}/flex-${PKG_FLEX_HOST_VERSION}.tar.gz};
 : ${PKG_INSTALL_STRIP_HOST_NO_LOG_VARS:=1};
 : ${PKG_LIBZ_HOST_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b};
 : ${PKG_LIBZ_HOST_VERSION:=1.2.8.2015.12.26};