From 26f9506e22d9ff65f8b2ea0e3aaf517d3f41e177 Mon Sep 17 00:00:00 2001
From: Helmut Pozimski <helmut@pozimski.eu>
Date: Fri, 22 Jul 2016 10:36:53 +0200
Subject: [PATCH] kodi: remove --libdir=/usr/lib32 from configure on i686 to
 fix #3302 (#4493)

---
 srcpkgs/kodi/template | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/srcpkgs/kodi/template b/srcpkgs/kodi/template
index 09d66cf98c..35fb0645b4 100644
--- a/srcpkgs/kodi/template
+++ b/srcpkgs/kodi/template
@@ -1,7 +1,7 @@
 # Template file for 'kodi'
 pkgname=kodi
 version=16.1
-revision=3
+revision=4
 patch_args="-Np1"
 _codename="Jarvis"
 wrksrc="xbmc-${version}-${_codename}"
@@ -63,6 +63,13 @@ pre_configure() {
 do_configure() {
 	# Do not ship version check.
 	rm -rf addons/service.xbmc.versioncheck
+	# kodi fails to find it's userdata if it's configured with --libfir=/usr/lib32, see
+	# https://github.com/voidlinux/void-packages/issues/3302
+
+	if [ "${XBPS_TARGET_MACHINE}" = "i686" ]; then
+		configure_args=${configure_args/--libdir=\/usr\/lib32/}
+	fi
+
 	./configure ${configure_args} \
 		--disable-debug --enable-optimizations --enable-gl \
 		--enable-sdl --enable-vdpau --enable-vaapi --enable-joystick \