vars/build.vars: adds host glib v2.46.2 and libffi v3.2.1 in order to cross-compile atk &c.

1 files changed, 30 insertions, 11 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 49403678..53c1828d 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -255,9 +255,10 @@ LIB_PACKAGES_CONFIGURE_ARGS="-C --disable-nls --host=${TARGET} --prefix= --targe
 LIB_PACKAGES_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 LIB_PACKAGES_MAKEFLAGS_INSTALL="DESTDIR=${PREFIX_NATIVE}";
 LIB_PACKAGES_PACKAGES_LEAVES="
-expat libxml2 apr apr_util bzip2 curl libz libpng libffi gdbm geoip pcre glib gzip libarchive
-libatomic_ops libpipeline libressl libevent libfetch libgpg_error libassuan libcaca libfirm libgcrypt
-libjpeg_turbo libksba lua ncurses ncursestw ncursesw npth sqlite3 tiff xz";
+expat libxml2 apr apr_util bzip2 curl libz libpng libffi gdbm geoip pcre libffi_host
+glib_host glib gzip libarchive libatomic_ops libpipeline libressl libevent libfetch
+libgpg_error libassuan libcaca libfirm libgcrypt libjpeg_turbo libksba lua ncurses
+ncursestw ncursesw npth sqlite3 tiff xz";
 LIB_PACKAGES_PACKAGES_X11="
 inputproto kbproto xcb_proto xproto libXau libpthread_stubs xcb xextproto xtrans libX11
 libXext freetype fontconfig renderproto Xrender libXft libICE libSM libXt libXmu libXpm
@@ -269,6 +270,13 @@ LIB_PACKAGES_PACKAGES="
 	${LIB_PACKAGES_PACKAGES_X11}
 	${LIB_PACKAGES_PACKAGES_LIBS}";
 LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
+: ${PKG_EXPAT_SHA256SUM:=d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff};
+: ${PKG_EXPAT_VERSION:=2.2.0};
+: ${PKG_EXPAT_URL:=http://pkgs.fedoraproject.org/repo/pkgs/expat/expat-${PKG_EXPAT_VERSION}.tar.bz2/2f47841c829facb346eb6e3fab5212e2/expat-${PKG_EXPAT_VERSION}.tar.bz2};
+: ${PKG_LIBXML2_SHA256SUM:=ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c};
+: ${PKG_LIBXML2_VERSION:=2.9.4};
+: ${PKG_LIBXML2_URL:=ftp://xmlsoft.org/libxml2/libxml2-${PKG_LIBXML2_VERSION}.tar.gz};
+: ${PKG_LIBXML2_CONFIGURE_ARGS_EXTRA:="--with-python=no"};
 : ${PKG_APR_SHA256SUM:=09109cea377bab0028bba19a92b5b0e89603df9eab05c0f7dbd4dd83d48dcebd};
 : ${PKG_APR_VERSION:=1.6.2};
 : ${PKG_APR_URL:=http://mirror.yannic-bonenberger.com/apache/apr/apr-${PKG_APR_VERSION}.tar.bz2};
@@ -291,9 +299,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_CURL_VERSION:=7.51.0};
 : ${PKG_CURL_URL:=https://curl.haxx.se/download/curl-${PKG_CURL_VERSION}.tar.bz2};
 : ${PKG_CURL_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib};
-: ${PKG_EXPAT_SHA256SUM:=d9e50ff2d19b3538bd2127902a89987474e1a4db8e43a66a4d1a712ab9a504ff};
-: ${PKG_EXPAT_VERSION:=2.2.0};
-: ${PKG_EXPAT_URL:=http://pkgs.fedoraproject.org/repo/pkgs/expat/expat-${PKG_EXPAT_VERSION}.tar.bz2/2f47841c829facb346eb6e3fab5212e2/expat-${PKG_EXPAT_VERSION}.tar.bz2};
 : ${PKG_LIBPNG_SHA256SUM:=232a602de04916b2b5ce6f901829caf419519e6a16cc9cd7c1c91187d3ee8b41};
 : ${PKG_LIBPNG_VERSION:=1.6.31};
 : ${PKG_LIBPNG_URL:=https://sourceforge.mirrorservice.org/l/li/libpng/libpng16/${PKG_LIBPNG_VERSION}/libpng-${PKG_LIBPNG_VERSION}.tar.xz};
@@ -314,11 +319,29 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_PCRE_SHA256SUM:=244838e1f1d14f7e2fa7681b857b3a8566b74215f28133f14a8f5e59241b682c};
 : ${PKG_PCRE_VERSION:=8.41};
 : ${PKG_PCRE_URL:=ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${PKG_PCRE_VERSION}.tar.gz};
+: ${PKG_LIBFFI_HOST_SHA256SUM:=d06ebb8e1d9a22d19e38d63fdb83954253f39bedc5d46232a05645685722ca37};
+: ${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_BUILD_TYPE:=host};
+: ${PKG_LIBFFI_HOST_CFLAGS_CONFIGURE:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"};
+: ${PKG_LIBFFI_HOST_LDFLAGS_CONFIGURE:=" "};
+: ${PKG_LIBFFI_HOST_CONFIGURE_ARGS:="-C --disable-nls --prefix=${PREFIX} --program-prefix="};
+: ${PKG_LIBFFI_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
+: ${PKG_GLIB_HOST_SHA256SUM:=5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db};
+: ${PKG_GLIB_HOST_VERSION:=2.46.2};
+: ${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};
+: ${PKG_GLIB_HOST_BUILD_TYPE:=host};
+: ${PKG_GLIB_HOST_CFLAGS_CONFIGURE:="${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT:+${LIB_PACKAGES_CFLAGS_CONFIGURE_DEFAULT} }"};
+: ${PKG_GLIB_HOST_CONFIGURE_ARGS:="-C --disable-libelf --disable-nls --prefix=${PREFIX} --program-prefix="};
+: ${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:=-L${PREFIX}/lib};
+: ${PKG_GLIB_HOST_MAKEFLAGS_INSTALL:=DESTDIR=};
+: ${PKG_GLIB_HOST_MAKEFLAGS_BUILD_EXTRA:=V=99};
 : ${PKG_GLIB_SHA256SUM:=5031722e37036719c1a09163cc6cf7c326e4c4f1f1e074b433c156862bd733db};
 : ${PKG_GLIB_VERSION:=2.46.2};
 : ${PKG_GLIB_URL:=http://ftp.gnome.org/pub/GNOME/sources/glib/${PKG_GLIB_VERSION%.[0-9]}/glib-${PKG_GLIB_VERSION}.tar.xz};
 : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:=--disable-libelf};
-: ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_NATIVE}/lib/libffi-3.2.1/include:LIBFFI_LIBS=-L${PREFIX_NATIVE}/lib -lffi};
+: ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_NATIVE}/lib/libffi-${PKG_LIBFFI_VERSION}/include:LIBFFI_LIBS=-L${PREFIX_NATIVE}/lib -lffi};
 : ${PKG_GLIB_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_NATIVE}/lib};
 : ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99};
 : ${PKG_GZIP_SHA256SUM:=1ff7aedb3d66a0d73f442f6261e4b3860df6fd6c94025c2cb31a202c9c60fe0e};
@@ -382,10 +405,6 @@ LIB_PACKAGES_PREFIX="${PREFIX_NATIVE}";
 : ${PKG_LIBKSBA_SHA256SUM:=41444fd7a6ff73a79ad9728f985e71c9ba8cd3e5e53358e70d5f066d35c1a340};
 : ${PKG_LIBKSBA_VERSION:=1.3.5};
 : ${PKG_LIBKSBA_URL:=https://www.gnupg.org/ftp/gcrypt/libksba/libksba-${PKG_LIBKSBA_VERSION}.tar.bz2};
-: ${PKG_LIBXML2_SHA256SUM:=ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c};
-: ${PKG_LIBXML2_VERSION:=2.9.4};
-: ${PKG_LIBXML2_URL:=ftp://xmlsoft.org/libxml2/libxml2-${PKG_LIBXML2_VERSION}.tar.gz};
-: ${PKG_LIBXML2_CONFIGURE_ARGS_EXTRA:="--with-python=no"};
 : ${PKG_LUA_SHA256SUM:=5113c06884f7de453ce57702abaac1d618307f33f6789fa870e87a59d772aca2};
 : ${PKG_LUA_VERSION:=5.3.3};
 : ${PKG_LUA_URL:=https://www.lua.org/ftp/lua-${PKG_LUA_VERSION}.tar.gz};