diff options
Diffstat (limited to 'meta/recipes-devtools/ccache')
| -rw-r--r-- | meta/recipes-devtools/ccache/ccache_4.9.1.bb (renamed from meta/recipes-devtools/ccache/ccache_4.4.bb) | 14 | ||||
| -rw-r--r-- | meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch | 37 |
2 files changed, 44 insertions, 7 deletions
diff --git a/meta/recipes-devtools/ccache/ccache_4.4.bb b/meta/recipes-devtools/ccache/ccache_4.9.1.bb index 203be8c92d..0d447c4915 100644 --- a/meta/recipes-devtools/ccache/ccache_4.4.bb +++ b/meta/recipes-devtools/ccache/ccache_4.9.1.bb @@ -6,17 +6,17 @@ Objective-C and Objective-C++." HOMEPAGE = "http://ccache.samba.org" SECTION = "devel" -LICENSE = "GPLv3+" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=73963d63171ecbdf2d25274de67c68c5" +LICENSE = "GPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=9896d6f0aee4d89b9e5ff0afaae0af06" DEPENDS = "zstd" -SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" -SRC_URI[sha256sum] = "61a993d62216aff35722a8d0e8ffef9b677fc3f6accd8944ffc2a6db98fb3142" +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \ + file://0001-xxhash.h-Fix-build-with-gcc-12.patch \ + " +SRC_URI[sha256sum] = "12834ecaaaf2db069dda1d1d991f91c19e3274cc04a471af5b64195def17e90f" -UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" - -inherit cmake +inherit cmake github-releases PATCHTOOL = "patch" diff --git a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch b/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch new file mode 100644 index 0000000000..e65b830257 --- /dev/null +++ b/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch @@ -0,0 +1,37 @@ +From d17fdacf4892a15fafb56b0890ece05b485e89fb Mon Sep 17 00:00:00 2001 +From: Mingli Yu <mingli.yu@windriver.com> +Date: Mon, 6 Jun 2022 17:53:20 +0800 +Subject: [PATCH] xxhash.h: Fix build with gcc-12 + +Remove inline attribute to fix below build failure: + | /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:3932:1: error: inlining failed in call to 'always_inline' 'XXH3_accumulate_512_sse2': function not considered for inlining + 3932 | XXH3_accumulate_512_sse2( void* XXH_RESTRICT acc, + | ^~~~~~~~~~~~~~~~~~~~~~~~ + /buildarea/tmp/work/core2-64-poky-linux/ccache/4.6.1-r0/ccache-4.6.1/src/third_party/xxhash.h:4369:9: note: called from here + 4369 | f_acc512(acc, + | ^~~~~~~~~~~~~ + 4370 | in, + | ~~~ + 4371 | secret + n*XXH_SECRET_CONSUME_RATE); + +Upstream-Status: Submitted [https://github.com/Cyan4973/xxHash/pull/720] + +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> + +--- + src/third_party/xxhash.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h +index a18e8c7..1b72307 100644 +--- a/src/third_party/xxhash.h ++++ b/src/third_party/xxhash.h +@@ -2107,7 +2107,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) + # define XXH_NO_INLINE static + /* enable inlining hints */ + #elif defined(__GNUC__) || defined(__clang__) +-# define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused)) ++# define XXH_FORCE_INLINE static + # define XXH_NO_INLINE static __attribute__((noinline)) + #elif defined(_MSC_VER) /* Visual Studio */ + # define XXH_FORCE_INLINE static __forceinline |