snailed
/
void-packages
2
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Activity

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.
This commit is contained in:
Jürgen Buchmüller 2015-11-19 15:18:35 +01:00
parent 6c4c9a1590
commit 9bd521e9bd
2 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
srcpkgs/xerces-c/template
View File

@ -1,7 +1,7 @@
# Template file for 'xerces-c' # Template file for 'xerces-c'
pkgname=xerces-c pkgname=xerces-c
version=3.1.2 version=3.1.2
revision=1 revision=2
build_style=gnu-configure build_style=gnu-configure
hostmakedepends="pkg-config" hostmakedepends="pkg-config"
makedepends="libcurl-devel icu55-devel" 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" distfiles="http://apache.mirror.digionline.de//xerces/c/3/sources/${pkgname}-${version}.tar.bz2"
checksum=95d8655c4c50668ad60d555b59da9f31937b2c53638aa8d5768cb169f192d5e1 checksum=95d8655c4c50668ad60d555b59da9f31937b2c53638aa8d5768cb169f192d5e1
case "$XBPS_TARGET_MACHINE" in
i686) # Compiling src/xercesc/util/PlatformUtils.cpp fails with PIE enabled
nopie=yes
esac
libxerces-c_package() { libxerces-c_package() {
short_desc+=" - shared library" short_desc+=" - shared library"
pkg_install() { pkg_install() {

2
xbps-src
View File

@ -591,7 +591,7 @@ else
export PATH="$MYPATH" export PATH="$MYPATH"
if [ -n "$XBPS_CCACHE" ]; then if [ -n "$XBPS_CCACHE" ]; then
CCACHEPATH="/usr/lib/ccache/bin" 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 # Avoid not using cached files just due to compiler mtime
# changes when e.g. bootstrapping # changes when e.g. bootstrapping
export CCACHE_COMPILERCHECK=content export CCACHE_COMPILERCHECK=content