vars/build.vars:host_packages_deps: correctly build expat_host prior to python2_host prior to glib_host.

vars/build.vars:python2_host:${PKG_CONFIGURE_ARGS_EXTRA}: configure w/ --with-system-expat.

1 files changed, 10 insertions, 9 deletions

diff --git a/vars/build.vars b/vars/build.vars
index ab089b34..1023f48a 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -325,8 +325,9 @@ HOST_PACKAGES_DEPS_CONFIGURE_ARGS="--disable-nls --prefix=${PREFIX} --program-pr
 HOST_PACKAGES_DEPS_LDFLAGS_CONFIGURE="-L${PREFIX}/lib";
 HOST_PACKAGES_DEPS_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 HOST_PACKAGES_DEPS_PACKAGES="
-cmake_host llvm_host clang_host libffi_host glib_host expat_host dbus_host dbus_glib_host gperf_host
-infounzip_host infozip_host intltool_host python2_host python3_host ruby_host";
+cmake_host llvm_host clang_host libffi_host expat_host python2_host
+glib_host dbus_host dbus_glib_host gperf_host infounzip_host infozip_host
+intltool_host python3_host ruby_host";
 HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_CMAKE_HOST_SHA256SUM:=dc1246c4e6d168ea4d6e042cfba577c1acd65feea27e56f5ff37df920c30cae0};
 : ${PKG_CMAKE_HOST_VERSION:=3.7.2};
@@ -342,6 +343,13 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_LIBFFI_HOST_VERSION:=3.2.1};
 : ${PKG_LIBFFI_HOST_URL:=ftp://sourceware.org/pub/libffi/libffi-${PKG_LIBFFI_HOST_VERSION}.tar.gz};
 : ${PKG_LIBFFI_HOST_PATCHES_EXTRA:="${BUILD_WORKDIR}/chainport/libffi-${PKG_LIBFFI_HOST_VERSION}.midipix.patch"};
+: ${PKG_EXPAT_HOST_SHA256SUM:=d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6};
+: ${PKG_EXPAT_HOST_VERSION:=2.2.5};
+: ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.bz2};
+: ${PKG_PYTHON2_HOST_SHA256SUM:=304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8};
+: ${PKG_PYTHON2_HOST_VERSION:=2.7.14};
+: ${PKG_PYTHON2_HOST_URL:=https://www.python.org/ftp/python/${PKG_PYTHON2_HOST_VERSION}/Python-${PKG_PYTHON2_HOST_VERSION}.tgz};
+: ${PKG_PYTHON2_HOST_CONFIGURE_ARGS_EXTRA:="--enable-ipv6 --enable-shared --enable-unicode=ucs4 --with-system-expat"};
 : ${PKG_GLIB_HOST_SHA256SUM:=fe22998ff0394ec31e6e5511c379b74011bee61a4421bca7fcab223dfbe0fc6a};
 : ${PKG_GLIB_HOST_VERSION:=2.54.0};
 : ${PKG_GLIB_HOST_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_HOST_VERSION%.[0-9]}/glib-${PKG_GLIB_HOST_VERSION}.tar.xz};
@@ -349,9 +357,6 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_GLIB_HOST_CONFIGURE_ARGS_EXTRA:="--disable-dtrace --disable-libelf --disable-libmount"};
 : ${PKG_GLIB_HOST_ENV_VARS_EXTRA:="LIBFFI_CFLAGS=-I${PREFIX}/lib/libffi-${PKG_LIBFFI_HOST_VERSION}/include:LIBFFI_LIBS=-L${PREFIX}/lib -lffi"};
 : ${PKG_GLIB_HOST_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX}/lib};
-: ${PKG_EXPAT_HOST_SHA256SUM:=d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6};
-: ${PKG_EXPAT_HOST_VERSION:=2.2.5};
-: ${PKG_EXPAT_HOST_URL:=http://download.openpkg.org/components/cache/expat/expat-${PKG_EXPAT_HOST_VERSION}.tar.bz2};
 : ${PKG_DBUS_HOST_VERSION:=1.11.20};
 : ${PKG_DBUS_HOST_URL:=https://dbus.freedesktop.org/releases/dbus/dbus-${PKG_DBUS_HOST_VERSION}.tar.gz};
 : ${PKG_DBUS_HOST_SHA256SUM:=7fd9d0536f7ec2f2afc94b84d5b5487f88c464e8d47c661d8e0b54aa83974bfa};
@@ -372,10 +377,6 @@ HOST_PACKAGES_DEPS_PREFIX="${PREFIX}";
 : ${PKG_INTLTOOL_HOST_SHA256SUM:=67c74d94196b153b774ab9f89b2fa6c6ba79352407037c8c14d5aeb334e959cd};
 : ${PKG_INTLTOOL_HOST_VERSION:=0.51.0};
 : ${PKG_INTLTOOL_HOST_URL:=https://launchpad.net/intltool/trunk/${PKG_INTLTOOL_HOST_VERSION}/+download/intltool-${PKG_INTLTOOL_HOST_VERSION}.tar.gz};
-: ${PKG_PYTHON2_HOST_SHA256SUM:=304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8};
-: ${PKG_PYTHON2_HOST_VERSION:=2.7.14};
-: ${PKG_PYTHON2_HOST_URL:=https://www.python.org/ftp/python/${PKG_PYTHON2_HOST_VERSION}/Python-${PKG_PYTHON2_HOST_VERSION}.tgz};
-: ${PKG_PYTHON2_HOST_CONFIGURE_ARGS_EXTRA:="--enable-ipv6 --enable-shared --enable-unicode=ucs4"};
 : ${PKG_PYTHON3_HOST_SHA256SUM:=687e067d9f391da645423c7eda8205bae9d35edc0c76ef5218dcbe4cc770d0d7};
 : ${PKG_PYTHON3_HOST_VERSION:=3.5.1};
 : ${PKG_PYTHON3_HOST_URL:=https://www.python.org/ftp/python/${PKG_PYTHON3_HOST_VERSION}/Python-${PKG_PYTHON3_HOST_VERSION}.tgz};