From 7e72db86c6a7631f31264db8cea94bfd9f5741b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=BCrgen=20Buchm=C3=BCller?= <pullmoll@t-online.de>
Date: Thu, 19 Nov 2015 16:11:43 +0100
Subject: [PATCH] xerces-c: set DISABLE_CCACHE=yes for i686

Re-enable the shared CCACHE_DIR which was not the root
cause of the problems.
---
 srcpkgs/xerces-c/template | 6 +++++-
 xbps-src                  | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index ef87de57237..d0a1692ca54 100644
--- a/srcpkgs/xerces-c/template
+++ b/srcpkgs/xerces-c/template
@@ -1,7 +1,7 @@
 # Template file for 'xerces-c'
 pkgname=xerces-c
 version=3.1.2
-revision=2
+revision=3
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel icu55-devel"
@@ -13,6 +13,10 @@ homepage="http://xerces.apache.org/xerces-c/"
 distfiles="http://apache.mirror.digionline.de//xerces/c/3/sources/${pkgname}-${version}.tar.bz2"
 checksum=95d8655c4c50668ad60d555b59da9f31937b2c53638aa8d5768cb169f192d5e1
 
+case "$XBPS_TARGET_MACHINE" in
+	i686*) export CCACHE_DISABLE=yes
+esac
+
 libxerces-c_package() {
 	short_desc+=" - shared library"
 	pkg_install() {
diff --git a/xbps-src b/xbps-src
index ea624c7b30f..27becac9c95 100755
--- a/xbps-src
+++ b/xbps-src
@@ -591,7 +591,7 @@ else
     export PATH="$MYPATH"
     if [ -n "$XBPS_CCACHE" ]; then
         CCACHEPATH="/usr/lib/ccache/bin"
-        export CCACHE_DIR="$XBPS_HOSTDIR/ccache-${XBPS_CROSS_BUILD:-${XBPS_MACHINE}}"
+        export CCACHE_DIR="$XBPS_HOSTDIR/ccache"
         # Avoid not using cached files just due to compiler mtime
         # changes when e.g. bootstrapping
         export CCACHE_COMPILERCHECK=content