summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobert Yang <liezhi.yang@windriver.com>2024-06-11 22:32:53 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2024-06-12 16:08:31 +0100
commit055867b32706cae7671e37fd43e67d403fc3269f (patch)
treef810f82c4f456391037ecd55551c27abee74d728
parente2961db409336bcb64be4831993b4d36fc0c1e28 (diff)
downloadpoky-055867b32706cae7671e37fd43e67d403fc3269f.tar.gz
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. (From OE-Core rev: 2de4229793df26c9d058885a422cf88f00046d45) Signed-off-by: Robert Yang <liezhi.yang@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/ccache/ccache_4.10.bb32
-rw-r--r--meta/recipes-devtools/ccache/ccache_4.9.1.bb26
-rw-r--r--meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch37
3 files changed, 32 insertions, 63 deletions
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 0000000000..df169b9c2b
--- /dev/null
+++ b/meta/recipes-devtools/ccache/ccache_4.10.bb
@@ -0,0 +1,32 @@
1SUMMARY = "a fast C/C++ compiler cache"
2DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \
3by caching the result of previous compilations and detecting when the \
4same compilation is being done again. Supported languages are C, C\+\+, \
5Objective-C and Objective-C++."
6HOMEPAGE = "http://ccache.samba.org"
7SECTION = "devel"
8
9LICENSE = "GPL-3.0-or-later & MIT & BSL-1.0 & ISC"
10LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=c72fa5755dc70ec5b439212d47299414 \
11 file://src/third_party/cpp-httplib/httplib.h;endline=6;md5=5389d9f5a88a138e42ba58894bbceeac \
12 file://src/third_party/nonstd-span/nonstd/span.hpp;endline=9;md5=b4af92a7f068b38c5b3410dceb30c186 \
13 file://src/third_party/win32-compat/win32/mktemp.c;endline=17;md5=d287e9c1f1cd2bb2bd164490e1cf449a \
14"
15
16DEPENDS = "zstd fmt xxhash"
17
18SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz"
19
20SRC_URI[sha256sum] = "16972ba62c8499045edc3ae7d7b8a0b419a961567f5ff0f01bf5a44194204775"
21
22inherit cmake github-releases
23
24PATCHTOOL = "patch"
25
26BBCLASSEXTEND = "native nativesdk"
27
28PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc"
29PACKAGECONFIG[redis] = "-DREDIS_STORAGE_BACKEND=ON,-DREDIS_STORAGE_BACKEND=OFF,hiredis"
30
31# ENABLE_TESTING requires doctest which is not present in oe
32EXTRA_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 0d447c4915..0000000000
--- a/meta/recipes-devtools/ccache/ccache_4.9.1.bb
+++ /dev/null
@@ -1,26 +0,0 @@
1SUMMARY = "a fast C/C++ compiler cache"
2DESCRIPTION = "ccache is a compiler cache. It speeds up recompilation \
3by caching the result of previous compilations and detecting when the \
4same compilation is being done again. Supported languages are C, C\+\+, \
5Objective-C and Objective-C++."
6HOMEPAGE = "http://ccache.samba.org"
7SECTION = "devel"
8
9LICENSE = "GPL-3.0-or-later"
10LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=9896d6f0aee4d89b9e5ff0afaae0af06"
11
12DEPENDS = "zstd"
13
14SRC_URI = "${GITHUB_BASE_URI}/download/v${PV}/${BP}.tar.gz \
15 file://0001-xxhash.h-Fix-build-with-gcc-12.patch \
16 "
17SRC_URI[sha256sum] = "12834ecaaaf2db069dda1d1d991f91c19e3274cc04a471af5b64195def17e90f"
18
19inherit cmake github-releases
20
21PATCHTOOL = "patch"
22
23BBCLASSEXTEND = "native nativesdk"
24
25PACKAGECONFIG[docs] = "-DENABLE_DOCUMENTATION=ON,-DENABLE_DOCUMENTATION=OFF,asciidoc"
26PACKAGECONFIG[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 e65b830257..0000000000
--- a/meta/recipes-devtools/ccache/files/0001-xxhash.h-Fix-build-with-gcc-12.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From d17fdacf4892a15fafb56b0890ece05b485e89fb Mon Sep 17 00:00:00 2001
2From: Mingli Yu <mingli.yu@windriver.com>
3Date: Mon, 6 Jun 2022 17:53:20 +0800
4Subject: [PATCH] xxhash.h: Fix build with gcc-12
5
6Remove inline attribute to fix below build failure:
7 | /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
8 3932 | XXH3_accumulate_512_sse2( void* XXH_RESTRICT acc,
9 | ^~~~~~~~~~~~~~~~~~~~~~~~
10 /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
11 4369 | f_acc512(acc,
12 | ^~~~~~~~~~~~~
13 4370 | in,
14 | ~~~
15 4371 | secret + n*XXH_SECRET_CONSUME_RATE);
16
17Upstream-Status: Submitted [https://github.com/Cyan4973/xxHash/pull/720]
18
19Signed-off-by: Mingli Yu <mingli.yu@windriver.com>
20
21---
22 src/third_party/xxhash.h | 2 +-
23 1 file changed, 1 insertion(+), 1 deletion(-)
24
25diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h
26index a18e8c7..1b72307 100644
27--- a/src/third_party/xxhash.h
28+++ b/src/third_party/xxhash.h
29@@ -2107,7 +2107,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size)
30 # define XXH_NO_INLINE static
31 /* enable inlining hints */
32 #elif defined(__GNUC__) || defined(__clang__)
33-# define XXH_FORCE_INLINE static __inline__ __attribute__((always_inline, unused))
34+# define XXH_FORCE_INLINE static
35 # define XXH_NO_INLINE static __attribute__((noinline))
36 #elif defined(_MSC_VER) /* Visual Studio */
37 # define XXH_FORCE_INLINE static __forceinline