| Message ID | 1443974761-2081-1-git-send-email-arnout@mind.be |
|---|---|
| State | Accepted |
| Commit | fe3395258c29e1290ead64548c05f34b1ea710ce |
| Headers | show |
>>>>> "Arnout" == Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> writes: > One of the gcc configure options that we hash for ccache is > --with-pkgversion which is set to something like Buildroot > 2015.11-git-00426-ge7e7e4f - i.e., it will change with every buildroot > commit. That's obviously not wanted, so substitute this away. > Also add a \n to the printf so the output is a bit more readable. > Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > package/gcc/gcc.mk | 3 ++- > 1 file changed, 2 insertions(+), 1 deletion(-) > diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk > index 420c4e9..e1d4bcf 100644 > --- a/package/gcc/gcc.mk > +++ b/package/gcc/gcc.mk > @@ -259,7 +259,8 @@ endif > # _CONF_OPTS contains some references to the absolute path of $(HOST_DIR), > # so substitute those away. > HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_HASH=\"`\ > - printf '%s' $(subst $(HOST_DIR),@HOST_DIR@,$($(PKG)_CONF_OPTS)) \ > + printf '%s\n' $(subst $(HOST_DIR),@HOST_DIR@,\ > + $(subst --with-pkgversion="Buildroot $(BR2_VERSION_FULL)",,$($(PKG)_CONF_OPTS))) \ This is all quite tricky, so I've updated the documentation above to explain it and committed, thanks!
diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk index 420c4e9..e1d4bcf 100644 --- a/package/gcc/gcc.mk +++ b/package/gcc/gcc.mk @@ -259,7 +259,8 @@ endif # _CONF_OPTS contains some references to the absolute path of $(HOST_DIR), # so substitute those away. HOST_GCC_COMMON_TOOLCHAIN_WRAPPER_ARGS += -DBR_CCACHE_HASH=\"`\ - printf '%s' $(subst $(HOST_DIR),@HOST_DIR@,$($(PKG)_CONF_OPTS)) \ + printf '%s\n' $(subst $(HOST_DIR),@HOST_DIR@,\ + $(subst --with-pkgversion="Buildroot $(BR2_VERSION_FULL)",,$($(PKG)_CONF_OPTS))) \ | sha256sum - $(HOST_GCC_COMMON_CCACHE_HASH_FILES) \ | cut -c -64 | tr -d '\n'`\" endif # BR2_CCACHE
One of the gcc configure options that we hash for ccache is --with-pkgversion which is set to something like Buildroot 2015.11-git-00426-ge7e7e4f - i.e., it will change with every buildroot commit. That's obviously not wanted, so substitute this away. Also add a \n to the printf so the output is a bit more readable. Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- package/gcc/gcc.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)