diff mbox

[v3,1/2] gcc: fix ccache hash of patches in BR2_GLOBAL_PATCH_DIR

Message ID 1460521232-28778-2-git-send-email-hchunhui@mail.ustc.edu.cn
State Accepted
Headers show

Commit Message

Chunhui He April 13, 2016, 4:20 a.m. UTC 
From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>

In commit f4682cf933, a hash of the patches applied to gcc was created
to make sure that ccache can properly detect when the toolchain has
changed. The patches applied to gcc consist of the buildroot patches in
package/gcc, but also potentially patches in BR2_GLOBAL_PATCH_DIR.
However, the path to the patches in BR2_GLOBAL_PATCH_DIR was corrected
incorrectly, because it misses a /. So instead of:

$(BR2_GLOBAL_PATCH_DIR)/gcc-initial/*.patch

it would look for

$(BR2_GLOBAL_PATCH_DIR)gcc-initial/*.patch

In other words, if BR2_GLOBAL_PATCH_DIR doesn't end with /, the patches
in BR2_GLOBAL_PATCH_DIR are not taken into account in the ccache hash.

To fix, add the missing /

Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Cc: He Chunhui <hchunhui@mail.ustc.edu.cn>
---
 package/gcc/gcc.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Thomas Petazzoni April 18, 2016, 9:06 p.m. UTC | #1 
Hello,

On Wed, 13 Apr 2016 04:20:31 +0000, Chunhui He wrote:
> From: "Arnout Vandecappelle (Essensium/Mind)" <arnout@mind.be>
> 
> In commit f4682cf933, a hash of the patches applied to gcc was created
> to make sure that ccache can properly detect when the toolchain has
> changed. The patches applied to gcc consist of the buildroot patches in
> package/gcc, but also potentially patches in BR2_GLOBAL_PATCH_DIR.
> However, the path to the patches in BR2_GLOBAL_PATCH_DIR was corrected
> incorrectly, because it misses a /. So instead of:
> 
> $(BR2_GLOBAL_PATCH_DIR)/gcc-initial/*.patch
> 
> it would look for
> 
> $(BR2_GLOBAL_PATCH_DIR)gcc-initial/*.patch
> 
> In other words, if BR2_GLOBAL_PATCH_DIR doesn't end with /, the patches
> in BR2_GLOBAL_PATCH_DIR are not taken into account in the ccache hash.
> 
> To fix, add the missing /
> 
> Signed-off-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
> Cc: He Chunhui <hchunhui@mail.ustc.edu.cn>
> ---
>  package/gcc/gcc.mk | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)

Applied to master, thanks.

Thomas
diff mbox

Patch

diff --git a/package/gcc/gcc.mk b/package/gcc/gcc.mk
index 5646b66..46f05ff 100644
--- a/package/gcc/gcc.mk
+++ b/package/gcc/gcc.mk
@@ -238,8 +238,8 @@  HOST_GCC_COMMON_CCACHE_HASH_FILES += $(DL_DIR)/$(GCC_SOURCE)
 HOST_GCC_COMMON_CCACHE_HASH_FILES += \
 	$(sort $(wildcard \
 		package/gcc/$(GCC_VERSION)/*.patch \
-		$(addsuffix $((PKG)_RAWNAME)/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
-		$(addsuffix $((PKG)_RAWNAME)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)))))
+		$(addsuffix /$((PKG)_RAWNAME)/$(GCC_VERSION)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR))) \
+		$(addsuffix /$((PKG)_RAWNAME)/*.patch,$(call qstrip,$(BR2_GLOBAL_PATCH_DIR)))))
 ifeq ($(BR2_xtensa),y)
 HOST_GCC_COMMON_CCACHE_HASH_FILES += $(HOST_GCC_XTENSA_OVERLAY_TAR)
 endif