From 9bd521e9bdfbdac78beb59eeb2f86d2ca5a954aa 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 15:18:35 +0100
Subject: [PATCH] xerces-c: no need to disable PIE for i686

It seems that sharing a common CCACHE_DIR for all compilers
is problematic between at least x86_64 and i686 in some cases.
Revert to using per architecture ccache directories.
---
 srcpkgs/xerces-c/template | 7 +------
 xbps-src                  | 2 +-
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/srcpkgs/xerces-c/template b/srcpkgs/xerces-c/template
index 9a22801ad4..ef87de5723 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=1
+revision=2
 build_style=gnu-configure
 hostmakedepends="pkg-config"
 makedepends="libcurl-devel icu55-devel"
@@ -13,11 +13,6 @@ 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) # Compiling src/xercesc/util/PlatformUtils.cpp fails with PIE enabled
-		nopie=yes
-esac
-
 libxerces-c_package() {
 	short_desc+=" - shared library"
 	pkg_install() {
diff --git a/xbps-src b/xbps-src
index 27becac9c9..ea624c7b30 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"
+        export CCACHE_DIR="$XBPS_HOSTDIR/ccache-${XBPS_CROSS_BUILD:-${XBPS_MACHINE}}"
         # Avoid not using cached files just due to compiler mtime
         # changes when e.g. bootstrapping
         export CCACHE_COMPILERCHECK=content