From 2de4229793df26c9d058885a422cf88f00046d45 Mon Sep 17 00:00:00 2001 From: Robert Yang Date: Tue, 11 Jun 2024 22:32:53 -0700 Subject: [PATCH] ccache: 4.9.1 -> 4.10 * Remove 0001-xxhash.h-Fix-build-with-gcc-12.patch since there is no xxhash in ccache by default any more. * License-Update: - Update LIC_FILES_CHKSUM becaue a few third party licenses have been removed: $ git diff --stat v4.9.1..v4.10 LICENSE.adoc LICENSE.adoc | 222 +++++++++--------------------- 1 file changed, 15 insertions(+), 207 deletions(-) And add more licenses for third party files. * Add required recipe fmt and xxhash to DEPENDS. * Set ENABLE_TESTING=OFF since it requires doctest which is not present in oe. Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-devtools/ccache/ccache_4.10.bb | 32 ++++++++++++++++ meta/recipes-devtools/ccache/ccache_4.9.1.bb | 26 ------------- .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 37 ------------------- 3 files changed, 32 insertions(+), 63 deletions(-) create mode 100644 meta/recipes-devtools/ccache/ccache_4.10.bb delete mode 100644 meta/recipes-devtools/ccache/ccache_4.9.1.bb delete mode 100644 meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch diff --git a/meta/recipes-devtools/ccache/ccache_4.10.bb b/meta/recipes-devtools/ccache/ccache_4.10.bb new file mode 100644 index 00000000000..df169b9c2b5 --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_4.10.bb @@ -0,0 +1,32 @@ +SUMMARY = "a fast C/C++ compiler cache" +DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \ +by caching the result of previous compilations and detecting when the \ +same compilation is being done again. Supported languages are C, C\+\+, \ +Objective-C and Objective-C++." +HOMEPAGE = "http://ccache.samba.org" +SECTION = "devel" + +LICENSE = "GPL-3.0-or-later & MIT & BSL-1.0 & ISC" +LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=c72fa5755dc70ec5b439212d47299414 \ + file://src/third_party/cpp-httplib/httplib.h;endline=6;md5=5389d9f5a88a138e42ba58894bbceeac \ + file://src/third_party/nonstd-span/nonstd/span.hpp;endline=9;md5=b4af92a7f068b38c5b3410dceb30c186 \ + file://src/third_party/win32-compat/win32/mktemp.c;endline=17;md5=d287e9c1f1cd2bb2bd164490e1cf449a \ +" + +DEPENDS = "zstd fmt xxhash" + +SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz" + +SRC_URI[sha256sum] = "16972ba62c8499045edc3ae7d7b8a0b419a961567f5ff0f01bf5a44194204775" + +inherit cmake github-releases + +PATCHTOOL = "patch" + +BBCLASSEXTEND = "native nativesdk" + +PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc" +PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis" + +# ENABLE_TESTING requires doctest which is not present in oe +EXTRA_OECMAKE += "-DENABLE_TESTING=OFF" diff --git a/meta/recipes-devtools/ccache/ccache_4.9.1.bb b/meta/recipes-devtools/ccache/ccache_4.9.1.bb deleted file mode 100644 index 0d447c49158..00000000000 --- a/meta/recipes-devtools/ccache/ccache_4.9.1.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "a fast C/C++ compiler cache" -DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \ -by caching the result of previous compilations and detecting when the \ -same compilation is being done again. Supported languages are C, C\+\+, \ -Objective-C and Objective-C++." -HOMEPAGE = "http://ccache.samba.org" -SECTION = "devel" - -LICENSE = "GPL-3.0-or-later" -LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=9896d6f0aee4d89b9e5ff0afaae0af06" - -DEPENDS = "zstd" - -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" - -inherit cmake github-releases - -PATCHTOOL = "patch" - -BBCLASSEXTEND = "native nativesdk" - -PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc" -PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis" 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 deleted file mode 100644 index e65b8302577..00000000000 --- a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch +++ /dev/null @@ -1,37 +0,0 @@ -From d17fdacf4892a15fafb56b0890ece05b485e89fb Mon Sep 17 00:00:00 2001 -From: Mingli Yu -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 - ---- - 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 -- 2.47.2