vars/build.vars:native_toolchain_deps: move {ncurses,lib{readline,z}} from native_packages_deps as dependencies of gdb.

1 files changed, 34 insertions, 21 deletions

diff --git a/vars/build.vars b/vars/build.vars
index f4071255..973a5fa8 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -381,7 +381,7 @@ NATIVE_TOOLS_PREFIX="${PREFIX_NATIVE}";
 #
 NATIVE_TOOLCHAIN_DEPS_CONFIGURE_ARGS="--disable-nls --host=${DEFAULT_TARGET} --prefix=/ --target=${DEFAULT_TARGET}";
 NATIVE_TOOLCHAIN_DEPS_PACKAGES="
-gmp libelf mpfr mpc";
+gmp libelf ncurses libreadline libz mpfr mpc";
 NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_GMP_SHA256SUM:=5275bb04f4863a13516b2f39392ac5e272f5e1bb8057b18aec1c9b79d73d8fb2};
 : ${PKG_GMP_VERSION:=6.1.2};
@@ -393,6 +393,31 @@ NATIVE_TOOLCHAIN_DEPS_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBELF_URL:=https://fossies.org/linux/misc/old/libelf-${PKG_LIBELF_VERSION}.tar.gz};
 : ${PKG_LIBELF_MAKE_INSTALL_VNAME:=prefix};
 : ${PKG_LIBELF_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/patches/libelf-${PKG_LIBELF_VERSION}.midipix.patch"};
+: ${PKG_NCURSES_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
+: ${PKG_NCURSES_VERSION:=6.1};
+: ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz};
+: ${PKG_NCURSES_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_NCURSES_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"}";
+: ${PKG_NCURSES_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"};
+: ${PKG_NCURSES_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 --without-pthread"};
+: ${PKG_NCURSES_LDFLAGS_CONFIGURE:="${DEFAULT_LDFLAGS:+${DEFAULT_LDFLAGS} }--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_NCURSES_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
+: ${PKG_LIBREADLINE_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334};
+: ${PKG_LIBREADLINE_VERSION:=7.0};
+: ${PKG_LIBREADLINE_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz};
+: ${PKG_LIBREADLINE_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_LIBREADLINE_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"}";
+: ${PKG_LIBREADLINE_CONFIGURE_ARGS:="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET} --with-curses"};
+: ${PKG_LIBREADLINE_LDFLAGS_CONFIGURE:="${DEFAULT_LDFLAGS:+${DEFAULT_LDFLAGS} }--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_LIBREADLINE_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
+: ${PKG_LIBZ_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b};
+: ${PKG_LIBZ_VERSION:=1.2.8.2015.12.26};
+: ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz};
+: ${PKG_LIBZ_CFLAGS_CONFIGURE:="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_LIBZ_CONFIG_CACHE_LOCAL:="${CONFIG_CACHE_GNULIB}"};
+: ${PKG_LIBZ_CONFIGURE_ARGS:="--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}"};
+: ${PKG_LIBZ_LDFLAGS_CONFIGURE:="${DEFAULT_LDFLAGS:+${DEFAULT_LDFLAGS} }--sysroot=${PREFIX_NATIVE}"};
+: ${PKG_LIBZ_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
 : ${PKG_MPFR_SHA256SUM:=79c73f60af010a30a5c27a955a1d2d01ba095b72537dab0ecaad57f5a7bb1b6b};
 : ${PKG_MPFR_VERSION:=3.1.2};
 : ${PKG_MPFR_URL:=ftp://ftp.gnu.org/gnu/mpfr/mpfr-${PKG_MPFR_VERSION}.tar.bz2};
@@ -631,14 +656,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 libz 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 ncurses
-ncursestw ncursesw libreadline 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 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";
 NATIVE_PACKAGES_DEPS_PREFIX="${PREFIX_NATIVE}";
 NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_LIBATOMIC_OPS_SHA256SUM:=587edf60817f56daf1e1ab38a4b3c729b8e846ff67b4f62a6157183708f099af};
@@ -705,10 +730,6 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${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_LIBZ_SHA256SUM:=abcc2831b7a0e891d0875fa852e9b9510b420d843d3d20aad010f65493fe4f7b};
-: ${PKG_LIBZ_VERSION:=1.2.8.2015.12.26};
-: ${PKG_LIBZ_URL:=https://sortix.org/libz/release/libz-${PKG_LIBZ_VERSION}.tar.gz};
-: ${PKG_LIBZ_CONFIGURE_ARGS:=--host=${DEFAULT_TARGET} --prefix= --target=${DEFAULT_TARGET}};
 : ${PKG_LMDB_URLS_GIT:="lmdb=https://github.com/Redfoxmoon3/lmdb.git@mdb.master"};
 : ${PKG_LMDB_IN_TREE:=1};
 : ${PKG_LIBPCAP_SHA256SUM:=64069f8a2e4b250b6b60b6058e5bad98cf648d2302a1e4cbf24eb770c1659875};
@@ -847,10 +868,6 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_LUA_IN_TREE:=1};
 : ${PKG_LUA_CONFIGURE_ARGS_EXTRA:="--with-readline --with-compat-module"};
 : ${PKG_LUA_INSTALL_FILES:=@liblua.so=lib/liblua.so.0};
-: ${PKG_NCURSES_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
-: ${PKG_NCURSES_VERSION:=6.1};
-: ${PKG_NCURSES_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSES_VERSION}.tar.gz};
-: ${PKG_NCURSES_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 --without-pthread"};
 : ${PKG_NCURSESTW_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
 : ${PKG_NCURSESTW_VERSION:=6.1};
 : ${PKG_NCURSESTW_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESTW_VERSION}.tar.gz};
@@ -860,10 +877,6 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${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_LIBREADLINE_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334};
-: ${PKG_LIBREADLINE_VERSION:=7.0};
-: ${PKG_LIBREADLINE_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_VERSION}.tar.gz};
-: ${PKG_LIBREADLINE_CONFIGURE_ARGS_EXTRA:=--with-curses};
 : ${PKG_LIBXSLT_SHA256SUM:=8e36605144409df979cab43d835002f63988f3dc94d5d3537c12796db90e38c8};
 : ${PKG_LIBXSLT_VERSION:=1.1.33};
 : ${PKG_LIBXSLT_URL:=ftp://xmlsoft.org/libxslt/libxslt-${PKG_LIBXSLT_VERSION}.tar.gz};