vars/build.vars:host_tools: adds bzip2_host v1.0.8.

vars/build.vars:host_tools: adds sqlite3_host v3160200.
vars/build.vars:ncursesw_host: update build order.
vars/build.vars:host_packages_deps: adds gdbm_host v1.18.1.
vars/build.vars:bzip2:${PKG_CFLAGS_BUILD_EXTRA}: remove obsolete variable.
vars/python2_host.vars: compile w/ -I${PREFIX}/include.

2 files changed, 28 insertions, 12 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 76aead85..03c0873b 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -150,7 +150,7 @@ gl_cv_C_locale_sans_EILSEQ=yes"};
 HOST_TOOLS_BUILD_TYPE="host";
 HOST_TOOLS_CONFIGURE_ARGS="--disable-nls --prefix= --target=${DEFAULT_TARGET}";
 HOST_TOOLS_PACKAGES="
-chainport_host slibtool_host bmake_host mdso_host mpackage_host perk_host install_strip_host pkgconf_host texinfo_host";
+chainport_host slibtool_host bmake_host bzip2_host mdso_host mpackage_host perk_host install_strip_host pkgconf_host sqlite3_host texinfo_host";
 HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_CHAINPORT_HOST_URLS_GIT:="chainport=${DEFAULT_GITROOT}/ports/chainport"};
 : ${PKG_CHAINPORT_HOST_BUILD_STEPS_DISABLE:=build};
@@ -159,6 +159,12 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${PKG_SLIBTOOL_HOST_CONFIGURE_ARGS:=--prefix=};
 : ${PKG_BMAKE_HOST_URLS_GIT:="bmake=https://github.com/arichardson/bmake@master"};
 : ${PKG_BMAKE_HOST_MAKEFLAGS_BUILD:=-j1};
+: ${PKG_BZIP2_HOST_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
+: ${PKG_BZIP2_HOST_VERSION:=1.0.8};
+: ${PKG_BZIP2_HOST_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_HOST_VERSION}.tar.gz};
+: ${PKG_BZIP2_HOST_IN_TREE:=1};
+: ${PKG_BZIP2_HOST_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
+: ${PKG_BZIP2_HOST_MAKE_INSTALL_VNAME:=PREFIX};
 : ${PKG_MDSO_HOST_URLS_GIT:="mdso=${DEFAULT_GITROOT}/mdso"};
 : ${PKG_MDSO_HOST_CONFIGURE_ARGS:="--prefix="};
 : ${PKG_MDSO_HOST_INSTALL_FILES:="@mdso=bin/${DEFAULT_TARGET}-mdso /=${DEFAULT_TARGET}/bin bin/mdso=${DEFAULT_TARGET}/bin/mdso"};
@@ -179,6 +185,10 @@ HOST_TOOLS_PREFIX="${PREFIX}";
 : ${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_SQLITE3_HOST_SHA256SUM:=65cc0c3e9366f50c0679c5ccd31432cea894bc4a3e8947dabab88c8693263615};
+: ${PKG_SQLITE3_HOST_VERSION:=3160200};
+: ${PKG_SQLITE3_HOST_URL:=https://sqlite.org/2017/sqlite-autoconf-${PKG_SQLITE3_HOST_VERSION}.tar.gz};
+: ${PKG_SQLITE3_HOST_CONFIGURE_ARGS_EXTRA:=--disable-static-shell};
 : ${PKG_TEXINFO_HOST_SHA256SUM:=988403c1542d15ad044600b909997ba3079b10e03224c61188117f3676b02caa};
 : ${PKG_TEXINFO_HOST_VERSION:=6.7};
 : ${PKG_TEXINFO_HOST_URL:=https://ftp.gnu.org/gnu/texinfo/texinfo-${PKG_TEXINFO_HOST_VERSION}.tar.xz};
@@ -533,11 +543,11 @@ HOST_PACKAGES_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-pr
 HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib -Wl,-rpath,${PREFIX}/lib";
 HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 HOST_PACKAGES_DEPS_PACKAGES="
-clzip_host ncurses_host ncursestw_host cmake_host musl_fts_host
-libzip_host llvm_host clang_host libffi_host expat_host ncursesw_host
-libreadline_host python2_host gdb_host dbus_host infounzip_host infozip_host
-intltool_host xz_host python3_host glib_host dbus_glib_host gperf_host
-ruby_host tzdb_host";
+clzip_host ncurses_host ncursesw_host ncursestw_host cmake_host
+musl_fts_host libzip_host llvm_host clang_host libffi_host expat_host 
+gdbm_host libreadline_host python2_host gdb_host dbus_host infounzip_host
+infozip_host intltool_host xz_host python3_host glib_host dbus_glib_host
+gperf_host ruby_host tzdb_host";
 HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_CLZIP_HOST_SHA256SUM:=d9d51212afa80371dc2546d278ef8ebbb3cd57c06fdd761b7b204497586d24c0};
 : ${PKG_CLZIP_HOST_VERSION:=1.11};
@@ -551,6 +561,11 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_NCURSES_HOST_CONFIGURE_ARGS:="-C --disable-nls --prefix=${PREFIX} --program-prefix= --with-curses"};
 : ${PKG_NCURSES_HOST_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX}/lib/pkgconfig --without-manpages --without-progs --with-shared --with-termlib --without-ada --without-tests --disable-widec --without-pthread"};
 : ${PKG_NCURSES_HOST_MAKEFLAGS_INSTALL:="PREFIX= prefix="};
+: ${PKG_NCURSESW_HOST_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
+: ${PKG_NCURSESW_HOST_VERSION:=6.1};
+: ${PKG_NCURSESW_HOST_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_HOST_VERSION}.tar.gz};
+: ${PKG_NCURSESW_HOST_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX}/lib/pkgconfig --with-manpages --with-progs --with-shared --with-termlib --without-ada --without-tests --enable-widec --without-pthread"};
+: ${PKG_NCURSESW_HOST_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
 : ${PKG_NCURSESTW_HOST_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
 : ${PKG_NCURSESTW_HOST_VERSION:=6.1};
 : ${PKG_NCURSESTW_HOST_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESTW_HOST_VERSION}.tar.gz};
@@ -581,11 +596,10 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_EXPAT_HOST_SHA256SUM:=17b43c2716d521369f82fc2dc70f359860e90fa440bea65b3b85f0b246ea81f2};
 : ${PKG_EXPAT_HOST_VERSION:=2.2.6};
 : ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.bz2};
-: ${PKG_NCURSESW_HOST_SHA256SUM:=aa057eeeb4a14d470101eff4597d5833dcef5965331be3528c08d99cebaa0d17};
-: ${PKG_NCURSESW_HOST_VERSION:=6.1};
-: ${PKG_NCURSESW_HOST_URL:=https://ftp.gnu.org/gnu/ncurses/ncurses-${PKG_NCURSESW_HOST_VERSION}.tar.gz};
-: ${PKG_NCURSESW_HOST_CONFIGURE_ARGS_EXTRA:="--enable-pc-files --with-pkg-config-libdir=${PREFIX}/lib/pkgconfig --with-manpages --with-progs --with-shared --with-termlib --without-ada --without-tests --enable-widec --without-pthread"};
-: ${PKG_NCURSESW_HOST_INSTALL_FILES:=@ncursesw/ncurses.h=include/ncurses.h};
+: ${PKG_GDBM_HOST_SHA256SUM:=86e613527e5dba544e73208f42b78b7c022d4fa5a6d5498bf18c8d6f745b91dc};
+: ${PKG_GDBM_HOST_VERSION:=1.18.1};
+: ${PKG_GDBM_HOST_URL:=ftp://ftp.gnu.org/gnu/gdbm/gdbm-${PKG_GDBM_HOST_VERSION}.tar.gz};
+: ${PKG_GDBM_HOST_CONFIGURE_ARGS_EXTRA:=--enable-libgdbm-compat};
 : ${PKG_LIBREADLINE_HOST_SHA256SUM:=750d437185286f40a369e1e4f4764eda932b9459b5ec9a731628393dd3d32334};
 : ${PKG_LIBREADLINE_HOST_VERSION:=7.0};
 : ${PKG_LIBREADLINE_HOST_URL:=ftp://ftp.gnu.org/gnu/readline/readline-${PKG_LIBREADLINE_HOST_VERSION}.tar.gz};
@@ -755,7 +769,6 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python2";
 : ${PKG_BZIP2_SHA256SUM:=ab5a03176ee106d3f0fa90e381da478ddae405918153cca248e682cd0c4a2269};
 : ${PKG_BZIP2_VERSION:=1.0.8};
 : ${PKG_BZIP2_URL:=https://sourceware.org/pub/bzip2/bzip2-${PKG_BZIP2_VERSION}.tar.gz};
-: ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${LIB_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_BZIP2_IN_TREE:=1};
 : ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1=lib/ ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.8=lib/"};
 : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
diff --git a/vars/python2_host.vars b/vars/python2_host.vars
index 6a041af7..c5c4eb21 100644
--- a/vars/python2_host.vars
+++ b/vars/python2_host.vars
@@ -10,6 +10,9 @@ pkg_python2_host_fetch_download() {
 	sed -i"" -e"s/-ltinfo/&w/" -e"s/mb_ncurses_libs='\([^']\+\)'/mb_ncurses_libs='\1 -ltinfow'/" ../sbpython2/project/config/cfgdefs.sh;
 	sed -i"" -e'108a\
 cfgtest_ldflags_append "-L$mb_prefix/lib"' ../sbpython2/project/config/cfgdefs.sh;
+	sed -i"" '/^PYCOMPILE_CFLAGS.*+= -std=c99/a\
+PYCOMPILE_CFLAGS	+= -I'"${PREFIX}"'/include
+' ../sbpython2/project/pycompile.mk
 	ex_pkg_state_set "${PKG_NAME}" fetch_download -fetch_extract;
 };