aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2016-06-20 13:13:09 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-06-23 14:23:20 +0100
commit15eaf9cb1fa19036fe4442905876dae94070b04d (patch)
tree850b18a649ba42bf6131dbebf051eddaa4265b1a
parentdf0d525c02780b5a0bd7a177a249c55f41797476 (diff)
downloadopenembedded-core-contrib-15eaf9cb1fa19036fe4442905876dae94070b04d.tar.gz
openembedded-core-contrib-15eaf9cb1fa19036fe4442905876dae94070b04d.tar.bz2
openembedded-core-contrib-15eaf9cb1fa19036fe4442905876dae94070b04d.zip
bitbake.conf: don't set CCACHE_DIR to $HOME by default
If the user hasn't inherited ccache.bbclass then CCACHE_DIR is set to $HOME. This was to work around a bug (#2554) for some users where if ccache < 3.1.10 (released 2014-10-19) was installed and enabled by default (i.e. /usr/bin/gcc is a symlink to ccache) and ccache.bbclass wasn't being inherited then autogen would fail to build because it sets $HOME to /dev/null during the build and ccache (prior to 3.1.10) would always create CCACHE_DIR even if it was disabled. As the default is $HOME/.ccache, this results in ccache attempting to create /dev/null/.ccache. However there was a mistake in this assignment of CCACHE_DIR - it should be $HOME/.ccache - as ccache will do cleanup inside CCACHE_DIR which will result in it deleting $HOME/tmp. In the future when we can assume that everyone has ccache 3.1.10 onwards this assignment can be deleted, but as of now we still support OpenSUSE 13.2 which ships with 3.1.9 so fix the assignment to be $HOME/.ccache. [ YOCTO #9798 ] Signed-off-by: Ross Burton <ross.burton@intel.com>
-rw-r--r--meta/conf/bitbake.conf8
1 files changed, 4 insertions, 4 deletions
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 942b8b1bf7c..a72d2f60543 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -450,10 +450,10 @@ 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 value 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')}"
+# ccache < 3.1.10 will create CCACHE_DIR on startup even if disabled, and
+# autogen sets HOME=/dev/null so in certain situations builds can fail.
+# Explicitly export CCACHE_DIR until we can assume ccache >3.1.10 on the host.
+export CCACHE_DIR ??= "${@os.getenv('HOME')}/.ccache"
TOOLCHAIN_OPTIONS = " --sysroot=${STAGING_DIR_TARGET}"