vars/build.vars, etc/build.usage: moves file_host to host_tools_deps as a common dependency of host_tools_rpm and host_packages.

2 files changed, 16 insertions, 6 deletions

diff --git a/etc/build.usage b/etc/build.usage
index 523b8fc5..e1acc08b 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -41,7 +41,7 @@ usage: ./build.sh [-4|6] [-a nt32|nt64] [-b debug|release]
         --debug-minipix         Don't strip(1) minipix binaries to facilitate debugging minipix.
         --rpm                   Build RPM packages for each package built; selects host_tools_rpm.
         <target>[ ..]           One of:
-                                host or host_tools, host_tools_rpm, host_toolchain_deps, host_toolchain, host_toolchain_mingw32,
+                                host or host_tools, host_tools_deps, host_tools_rpm, host_toolchain_deps, host_toolchain, host_toolchain_mingw32,
                                 native or native_tools, native_toolchain_deps, native_toolchain, native_toolchain_mingw32, native_runtime,
                                 packages_deps or host_packages_deps, native_packages_deps, native_packages_deps_x11,
                                 packages or native_packages, or dist.
diff --git a/vars/build.vars b/vars/build.vars
index 33ae8b25..8fe420e6 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -46,6 +46,19 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_PKGCONF_HOST_MAKEFLAGS_INSTALL_EXTRA:=prefix=};
 
 #
+# Build target host_tools_deps
+#
+HOST_TOOLS_DEPS_BUILD_TYPE="host";
+HOST_TOOLS_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX}";
+HOST_TOOLS_DEPS_MAKEFLAGS_INSTALL_EXTRA="prefix=";
+HOST_TOOLS_DEPS_PACKAGES="file_host";
+HOST_TOOLS_DEPS_PARALLELISE=0;
+HOST_TOOLS_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};
+
+#
 # Build target host_tools_rpm
 #
 HOST_TOOLS_RPM_BUILD_TYPE="host";
@@ -310,7 +323,7 @@ HOST_PACKAGES_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-pr
 HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE="";
 HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 HOST_PACKAGES_DEPS_PACKAGES="
-cmake_host llvm_host clang_host file_host libffi_host glib_host gperf_host
+cmake_host llvm_host clang_host libffi_host glib_host gperf_host
 infounzip_host infozip_host intltool_host python2_host python3_host ruby_host";
 HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_CMAKE_HOST_SHA256SUM:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0};
@@ -323,9 +336,6 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${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_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};
@@ -1303,7 +1313,7 @@ INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_tarballs";
 # Build targets
 #
 TARGETS_DEFAULT="
-host_tools host_tools_rpm host_toolchain_deps host_toolchain host_toolchain_mingw32
+host_tools host_tools_deps host_tools_rpm host_toolchain_deps host_toolchain host_toolchain_mingw32
 native_tools native_toolchain_deps native_toolchain native_toolchain_mingw32 native_runtime
 host_packages_deps native_packages_deps native_packages_deps_x11
 native_packages