From a062b7727d4cd69e7592f12c3da9af54a0a1f610 Mon Sep 17 00:00:00 2001 From: Wang Mingyu Date: Tue, 2 Jan 2024 15:20:49 +0800 Subject: ccache: upgrade 4.8.3 -> 4.9 License-Update: =============== Upgrade to fmt 10.1.1 Upgrade to cpp-httplib 0.14.3 Upgrade to BLAKE3 1.5.0 Changelog: https://ccache.dev/releasenotes.html#_ccache_4_9 0001-xxhash.h-Fix-build-with-gcc-12.patch refreshed for 4.9 (From OE-Core rev: a237c43adc717ea92e1353ee93c29b47a52ad81a) Signed-off-by: Wang Mingyu Signed-off-by: Alexandre Belloni Signed-off-by: Richard Purdie --- meta/recipes-devtools/ccache/ccache_4.8.3.bb | 26 ---------------------- meta/recipes-devtools/ccache/ccache_4.9.bb | 26 ++++++++++++++++++++++ .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 6 ++--- 3 files changed, 29 insertions(+), 29 deletions(-) delete mode 100644 meta/recipes-devtools/ccache/ccache_4.8.3.bb create mode 100644 meta/recipes-devtools/ccache/ccache_4.9.bb (limited to 'meta') diff --git a/meta/recipes-devtools/ccache/ccache_4.8.3.bb b/meta/recipes-devtools/ccache/ccache_4.8.3.bb deleted file mode 100644 index 03372aa685..0000000000 --- a/meta/recipes-devtools/ccache/ccache_4.8.3.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=6a6fe0ae4e57592b187ab72fa6d420ec" - -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] = "d59dd569ad2bbc826c0bc335c8ebd73e78ed0f2f40ba6b30069347e63585d9ef" - -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/ccache_4.9.bb b/meta/recipes-devtools/ccache/ccache_4.9.bb new file mode 100644 index 0000000000..8550470e3f --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_4.9.bb @@ -0,0 +1,26 @@ +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=11b0b581dd56bbac4f5de214d47927ca" + +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] = "866b2223d59333640f0e7a003cbb85b32d9ca3c9445bd9e3cf142942e69dd3ec" + +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 index 67c74a1e8e..e65b830257 100644 --- 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 @@ -1,4 +1,4 @@ -From 550834a3ec2e05e379be63b084e7fa06a1723f84 Mon Sep 17 00:00:00 2001 +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 @@ -23,10 +23,10 @@ Signed-off-by: Mingli Yu 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/third_party/xxhash.h b/src/third_party/xxhash.h -index 08ab794..c754e99 100644 +index a18e8c7..1b72307 100644 --- a/src/third_party/xxhash.h +++ b/src/third_party/xxhash.h -@@ -1501,7 +1501,7 @@ static void* XXH_memcpy(void* dest, const void* src, size_t size) +@@ -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__) -- cgit v1.2.3-54-g00ecf