Skip to contentSkip to conversation

bitbake.conf: disable ccache explicitly if it is not enabled

PATCH Applied Robert Yang 2 participants 3 messages Jun 26, 2012 – Jun 28, 2012

lore
Share & tools
lore
#0 lore raw

cover bitbake.conf: disable ccache explicitly if it is not enabled

The following changes since commit b876f42821383bf0069ee49b607ba06614417fba:

guile: fix compilation on MIPS/PPC (2012-06-21 14:42:25 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/autogen
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/autogen

Robert Yang (1):
bitbake.conf: disable ccache explicitly if it is not enabled

 meta/classes/ccache.bbclass |    1 +
 meta/conf/bitbake.conf      |    8 ++++++++
 2 files changed, 9 insertions(+), 0 deletions(-)
#1 lore raw

PATCH 1/1 bitbake.conf: disable ccache explicitly if it is not enabled

The autogen-native built error on FC17:

ccache: failed to create /dev/null/.ccache

This is because the default gcc command of FC17 is a symlink to ccache, so the ccache will always be used regardless to the setting of CCACHE, ccache uses $HOME/.ccache as the CACHE_DIR by default, but autogen set HOME=/dev/null, so the error happens.

Disable ccache explicitly if it is not enabled would fix the problem, otherwise it would always use ccache regardless to the setting of CCACHE on Fedora 17.

The ccache 3.1.7 has a bug, it would always create $CCCHE_DIR/.ccache even CCACHE_DISABLE=1.

Unset CCACHE_DISABLE in ccache.bbclass, since ccache only checks whether there is a CCACHE_DISABLE in the environment or not, it doesn't care about its value, so we need unset it explicitly when enable ccache.

[YOCTO #2554]

---
 meta/classes/ccache.bbclass |    1 +
 meta/conf/bitbake.conf      |    8 ++++++++
 2 files changed, 9 insertions(+), 0 deletions(-)
meta/classes/ccache.bbclass +1 -0
index 10f9b9f..5aa2da2 100644
@@ -1,5 +1,6 @@
 CCACHE = "${@bb.which(d.getVar('PATH', True), 'ccache') and 'ccache '}"
 export CCACHE_DIR = "${TMPDIR}/ccache/${MULTIMACH_HOST_SYS}/${PN}"
+CCACHE_DISABLE[unexport] = "1"
 
 do_configure[dirs] =+ "${CCACHE_DIR}"
 do_kernel_configme[dirs] =+ "${CCACHE_DIR}"
meta/conf/bitbake.conf +8 -0
index b6fbc7a..da8e780 100644
@@ -414,6 +414,14 @@ export PATH
 ##################################################################
 
 CCACHE ??= ""
+# Disable ccache explicitly if CCACHE is null since gcc may be a symlink
+# of ccache some distributions (e.g., Fedora 17).
+export CCACHE_DISABLE ??= "${@[0,1][d.getVar('CCACHE', True) == '']}"
+# Assign CCACHE_DIR a default vaule to fix a bug of ccache 3.1.7,
+# since it would always create CCACHE_DIR/.ccache even if
+# CCACHE_DISABLE = 1.
+export CCACHE_DIR ??= "${@os.getenv('HOME')}"
+
 TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"
 
 export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
Signature · 1 line
1.7.1
Applied
#2 lore raw
In reply to Robert Yang
Quoted 16 lines · Robert Yang

The following changes since commit b876f42821383bf0069ee49b607ba06614417fba:

   guile: fix compilation on MIPS/PPC (2012-06-21 14:42:25 +0100)

are available in the git repository at:
git://git.pokylinux.org/poky-contrib robert/autogen
http://git.pokylinux.org/cgit.cgi/poky-contrib/log/?h=robert/autogen

Robert Yang (1):
bitbake.conf: disable ccache explicitly if it is not enabled

  meta/classes/ccache.bbclass |    1 +
  meta/conf/bitbake.conf      |    8 ++++++++
  2 files changed, 9 insertions(+), 0 deletions(-)
Quoted 6 lines

_______________________________________________
Openembedded-core mailing list
[email protected]
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core

Merged into OE-Core

Thanks
Sau!