vars/build.vars:native_packages_deps_deps: split from native_packages_deps.

vars/build.vars:native_packages_deps:{curl,libarchive,ncurses{t,}w,libuv}: moved to native_packages_deps_deps as dependencies of cmake.
etc/build.usage: updated.

2 files changed, 44 insertions, 11 deletions

diff --git a/etc/build.usage b/etc/build.usage
index 4f2c02ff..78c76d11 100644
--- a/etc/build.usage
+++ b/etc/build.usage
@@ -37,8 +37,8 @@ usage: ./build.sh [-a nt32|nt64] [-b debug|release] [-C dir[,..]] [-D kind[,..]]
         --debug-minipix   Don't strip(1) minipix binaries to facilitate debugging minipix.
         <target>[ ..]     One of: host_packages_deps, host_toolchain, host_toolchain_deps, host_toolchain_mingw32,
                           host_tools, host_tools_deps, host_tools_rpm, minipix, native_packages, native_packages_deps,
-                          native_packages_deps_x11, native_runtime, native_toolchain, native_toolchain_deps,
-                          native_toolchain_mingw32, and/or native_tools.
+                          native_packages_deps_deps, native_packages_deps_x11, native_runtime, native_toolchain,
+                          native_toolchain_deps, native_toolchain_mingw32, and/or native_tools.
 
         ${HOME}/midipix_build.vars, ${HOME}/.midipix_build.vars, and/or ../midipix_build.vars will be sourced if present.
 
diff --git a/vars/build.vars b/vars/build.vars
index f98c479f..cf1428eb 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -649,6 +649,39 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_TZDB_HOST_BUILD_DIR:="tzdb-${PKG_TZDB_HOST_VERSION}"};
 
 #
+# Build target native_packages_deps_deps
+#
+NATIVE_PACKAGES_DEPS_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_DEPS_CONFIG_CACHE_LOCAL="${CONFIG_CACHE_GNULIB}";
+NATIVE_PACKAGES_DEPS_DEPS_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
+NATIVE_PACKAGES_DEPS_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
+NATIVE_PACKAGES_DEPS_DEPS_PACKAGES="
+curl libarchive ncursestw ncursesw libuv";
+NATIVE_PACKAGES_DEPS_DEPS_PREFIX="${PREFIX_NATIVE}";
+NATIVE_PACKAGES_DEPS_DEPS_PYTHON="${PREFIX}/bin/python2";
+: ${PKG_CURL_SHA256SUM:=ef6e55192d04713673b4409ccbcb4cb6cd723137d6e10ca45b0c593a454e1720};
+: ${PKG_CURL_VERSION:=7.61.0};
+: ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz};
+: ${PKG_CURL_CONFIGURE_ARGS_EXTRA:="--disable-symbol-hiding --enable-shared --with-ca-bundle=/etc/ssl/certs/ca-certificates.crt --with-ca-path=/etc/ssl/certs --with-gnutls --without-ssl"};
+: ${PKG_LIBARCHIVE_SHA256SUM:=ba7eb1781c9fbbae178c4c6bad1c6eb08edab9a1496c64833d1715d022b30e2e};
+: ${PKG_LIBARCHIVE_VERSION:=3.3.3};
+: ${PKG_LIBARCHIVE_URL:=http://www.libarchive.org/downloads/libarchive-${PKG_LIBARCHIVE_VERSION}.tar.gz};
+: ${PKG_LIBARCHIVE_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
+: ${PKG_NCURSESTW_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
+: ${PKG_NCURSESTW_VERSION:=6.1};
+: ${PKG_NCURSESTW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESTW_VERSION}.tar.gz};
+: ${PKG_NCURSESTW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --without-manpages --without-progs --with-shared --with-termlib --without-ada --without-tests --disable-widec --with-pthread"};
+: ${PKG_NCURSESW_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
+: ${PKG_NCURSESW_VERSION:=6.1};
+: ${PKG_NCURSESW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_VERSION}.tar.gz};
+: ${PKG_NCURSESW_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX_NATIVE}/lib/pkgconfig --with-manpages --with-progs --with-shared --with-termlib --without-ada --without-tests --enable-widec --without-pthread"};
+: ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
+: ${PKG_LIBUV_SHA256SUM:=7cbcf2017e7116cf9da8ec1c6a146d578536b1e479458438873c991f984a53d7};
+: ${PKG_LIBUV_VERSION:=1.19.2};
+: ${PKG_LIBUV_URL:=https://dist.libuv.org/dist/v${PKG_LIBUV_VERSION}/libuv-v${PKG_LIBUV_VERSION}.tar.gz};
+
+#
 # Build target native_packages_deps
 #
 NATIVE_PACKAGES_DEPS_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
@@ -658,14 +691,14 @@ NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_PACKAGES="
 libatomic_ops bdwgc clzip expat libxml2 alsa_lib apr apr_util bzip2
-libdmtx libressl libnettle libunistring gnutls curl lmdb libpcap
-libpng libjpeg_turbo tiff giflib lcms2 openjpeg libffi gdbm geoip pcre
-gettext_tiny glib gzip libarchive musl_compat musl_fts libzip libbsd
-libpipeline libtelnet libevent libfetch libogg libvorbis libflac libtheora
-libsasl2 libshine libsndfile libgpg_error libassuan libfirm libgcrypt
-libksba libudns lua ncursestw ncursesw libxslt libtirpc npth popt file
-xz zstd rpm libsolv tdnf shared_mime_info sqlite3 w32api w32lib libuv
-cmake qrencode tcl util_linux slang utf8proc";
+libdmtx libressl libnettle libunistring gnutls lmdb libpcap libpng
+libjpeg_turbo tiff giflib lcms2 openjpeg libffi gdbm geoip pcre
+gettext_tiny glib gzip musl_compat musl_fts libzip libbsd libpipeline
+libtelnet libevent libfetch libogg libvorbis libflac libtheora libsasl2
+libshine libsndfile libgpg_error libassuan libfirm libgcrypt libksba
+libudns lua libxslt libtirpc npth popt file xz zstd rpm libsolv tdnf
+shared_mime_info sqlite3 w32api w32lib cmake qrencode tcl util_linux
+slang utf8proc";
 NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_LIBATOMIC_OPS_SHA256SUM:=587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af};
@@ -1922,7 +1955,7 @@ INVARIANTS_PACKAGES="invariants_digest invariants_gitref invariants_minipix inva
 TARGETS_DEFAULT="
 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
+host_packages_deps native_packages_deps_deps native_packages_deps native_packages_deps_x11
 native_packages
 minipix";