From 11ee19688cab2dbb01d09ce9dcb7ad0a1d16f417 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <l.illanes@gmx.de>
Date: Sat, 11 Jun 2016 15:32:13 +0000
Subject: Provide workaround for glib-2.46.2 build failure w/ slibtool by
 forcing usage of libtool w/o the `make LIBTOOL=[ ... ]' hack. Fixes related
 glib-2.46.2 32-bit build failure in
 <95162014754fca037510884f5a3c0c73988cd902>.

---
 build.vars | 3 ++-
 pkg.build  | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build.vars b/build.vars
index cf530934..ae6cf1b4 100644
--- a/build.vars
+++ b/build.vars
@@ -155,7 +155,8 @@ export PATH="${PREFIX}/bin${PATH:+:${PATH}}";
 : ${PKG_GLIB_CONFIGURE_ARGS_EXTRA:=--with-pcre=internal --disable-libelf};
 : ${PKG_GLIB_ENV_VARS_EXTRA:=LIBFFI_CFLAGS=-I${PREFIX_LVL3}/lib/libffi-3.2.1/include:LIBFFI_LIBS=-L${PREFIX_LVL3}/lib -lffi};
 : ${PKG_GLIB_LDFLAGS_CONFIGURE_EXTRA:=-L${PREFIX_LVL3}/lib};
-: ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99 -j1};
+: ${PKG_GLIB_MAKEFLAGS_BUILD_EXTRA:=V=99};
+: ${PKG_GLIB_SLIBTOOL:=none};
 : ${PKG_GMP_VERSION:=5.1.3};
 : ${PKG_GMP_SHA256SUM:=752079520b4690531171d0f4532e40f08600215feefede70b24fabdc6f1ab160};
 : ${PKG_GMP_URL:=https://gmplib.org/download/gmp/gmp-${PKG_GMP_VERSION}.tar.bz2};
diff --git a/pkg.build b/pkg.build
index e56e9c50..3cb38e5c 100644
--- a/pkg.build
+++ b/pkg.build
@@ -104,7 +104,9 @@ if ! is_build_script_done build; then
 	if test_cmd pkg_${PKG_NAME}_build; then
 		pkg_${PKG_NAME}_build;
 	else
-		export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}";
+		if [ "${PKG_SLIBTOOL}" != "none" ]; then
+			export MAKE="make LIBTOOL=${PKG_SLIBTOOL:-slibtool}";
+		fi;
 		run_cmd_unsplit make					\
 			${PKG_MAKEFLAGS_BUILD}				\
 			${PKG_MAKEFLAGS_BUILD_EXTRA}			\
-- 
cgit v1.2.3