vars/build.vars:native_packages_deps: build libnettle prior to gnutls prior to curl (via Redfoxmoon.)

1 files changed, 16 insertions, 15 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 41f0eeaa..d6c44c03 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -397,12 +397,13 @@ NATIVE_PACKAGES_DEPS_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} -
 NATIVE_PACKAGES_DEPS_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 NATIVE_PACKAGES_DEPS_PACKAGES="
-expat libxml2 alsa_lib apr apr_util bzip2 libdmtx libressl curl libz lmdb
-libpng libjpeg_turbo tiff giflib libffi gdbm geoip pcre glib gzip libarchive
-libatomic_ops musl_compat libbsd libpipeline libevent libfetch libogg libvorbis libunistring
-libgpg_error libassuan libfirm libgcrypt libksba libudns lua ncurses ncursestw
-ncursesw libnettle gnutls libreadline npth popt file xz zstd rpm libsolv tdnf
-shared_mime_info sqlite3 w32api w32lib libuv cmake qrencode util_linux slang";
+expat libxml2 alsa_lib apr apr_util bzip2 libdmtx libressl libnettle
+gnutls curl libz lmdb libpng libjpeg_turbo tiff giflib libffi gdbm geoip
+pcre glib gzip libarchive libatomic_ops musl_compat libbsd libpipeline
+libevent libfetch libogg libvorbis libunistring libgpg_error libassuan
+libfirm libgcrypt libksba libudns lua ncurses ncursestw ncursesw
+libreadline npth popt file xz zstd rpm libsolv tdnf shared_mime_info
+sqlite3 w32api w32lib libuv cmake qrencode util_linux slang";
 NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
 : ${PKG_EXPAT_SHA256SUM:=d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6};
@@ -440,6 +441,15 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
 : ${PKG_LIBRESSL_URL:=http://ftp.eu.openbsd.org/pub/OpenBSD/LibreSSL/libressl-${PKG_LIBRESSL_VERSION}.tar.gz};
 : ${PKG_LIBRESSL_CFLAGS_CONFIGURE_EXTRA:=-D__MIDIPIX};
 : ${PKG_LIBRESSL_CONFIGURE_ARGS_EXTRA:=--disable-asm --enable-nc};
+: ${PKG_LIBNETTLE_SHA256SUM:=ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94};
+: ${PKG_LIBNETTLE_VERSION:=3.4};
+: ${PKG_LIBNETTLE_URL:=https://ftp.gnu.org/gnu/nettle/nettle-${PKG_LIBNETTLE_VERSION}.tar.gz};
+: ${PKG_LIBNETTLE_CONFIGURE_ARGS_EXTRA:=--disable-assembler};
+: ${PKG_GNUTLS_SHA256SUM:=bcd5db7b234e02267f36b5d13cf5214baac232b7056a506252b7574ea7738d1f};
+: ${PKG_GNUTLS_VERSION:=3.6.2};
+: ${PKG_GNUTLS_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_GNUTLS_VERSION%.*}/gnutls-${PKG_GNUTLS_VERSION}.tar.xz};
+: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-ssl3-support --disable-ssl2-support --disable-cxx --disable-tools --enable-local-libopts --with-included-libtasn1 --without-p11-kit --disable-hardware-acceleration"};
+: ${PKG_GNUTLS_LIBTOOL:=slibtool-shared};
 : ${PKG_CURL_SHA256SUM:=e44eaabdf916407585bf5c7939ff1161e6242b6b015d3f2f5b758b2a330461fc};
 : ${PKG_CURL_VERSION:=7.59.0};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.xz};
@@ -559,15 +569,6 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
 : ${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-shared --without-ada --with-manpages --with-progs --without-tests --enable-widec --without-pthread"};
 : ${PKG_NCURSESW_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
-: ${PKG_LIBNETTLE_SHA256SUM:=ae7a42df026550b85daca8389b6a60ba6313b0567f374392e54918588a411e94};
-: ${PKG_LIBNETTLE_VERSION:=3.4};
-: ${PKG_LIBNETTLE_URL:=https://ftp.gnu.org/gnu/nettle/nettle-${PKG_LIBNETTLE_VERSION}.tar.gz};
-: ${PKG_LIBNETTLE_CONFIGURE_ARGS_EXTRA:=--disable-assembler};
-: ${PKG_GNUTLS_SHA256SUM:=bcd5db7b234e02267f36b5d13cf5214baac232b7056a506252b7574ea7738d1f};
-: ${PKG_GNUTLS_VERSION:=3.6.2};
-: ${PKG_GNUTLS_URL:=https://www.gnupg.org/ftp/gcrypt/gnutls/v${PKG_GNUTLS_VERSION%.*}/gnutls-${PKG_GNUTLS_VERSION}.tar.xz};
-: ${PKG_GNUTLS_CONFIGURE_ARGS_EXTRA:="--disable-ssl3-support --disable-ssl2-support --disable-cxx --disable-tools --enable-local-libopts --with-included-libtasn1 --without-p11-kit --disable-hardware-acceleration"};
-: ${PKG_GNUTLS_LIBTOOL:=slibtool-shared};
 : ${PKG_LIBREADLINE_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334};
 : ${PKG_LIBREADLINE_VERSION:=7.0};
 : ${PKG_LIBREADLINE_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz};