From 1d4ac06c850b37d129a522c6909f7babfcdbd9d9 Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 23 Aug 2022 11:01:51 -0700 Subject: ccache: Upgrade to 4.6.2 Fix build with musl (From OE-Core rev: a76700a47c227e76551d2f2c86db5841ad7f6e8f) Signed-off-by: Khem Raj Signed-off-by: Richard Purdie --- meta/recipes-devtools/ccache/ccache_4.6.1.bb | 29 --------------------- meta/recipes-devtools/ccache/ccache_4.6.2.bb | 30 ++++++++++++++++++++++ .../files/0001-Include-time.h-for-time_t.patch | 12 ++++----- .../0001-xxhash.h-Fix-build-with-gcc-12.patch | 6 ++--- ...-Include-sys-types.h-for-mode_t-defintion.patch | 25 ++++++++++++++++++ 5 files changed, 62 insertions(+), 40 deletions(-) delete mode 100644 meta/recipes-devtools/ccache/ccache_4.6.1.bb create mode 100644 meta/recipes-devtools/ccache/ccache_4.6.2.bb create mode 100644 meta/recipes-devtools/ccache/files/0002-config-Include-sys-types.h-for-mode_t-defintion.patch (limited to 'meta/recipes-devtools/ccache') diff --git a/meta/recipes-devtools/ccache/ccache_4.6.1.bb b/meta/recipes-devtools/ccache/ccache_4.6.1.bb deleted file mode 100644 index 716aec0584..0000000000 --- a/meta/recipes-devtools/ccache/ccache_4.6.1.bb +++ /dev/null @@ -1,29 +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=7a19377a02749d8a1281ed608169b0ee" - -DEPENDS = "zstd" - -SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \ - file://0001-xxhash.h-Fix-build-with-gcc-12.patch \ - file://0001-Include-time.h-for-time_t.patch \ -" -SRC_URI[sha256sum] = "59b28a57c3a45e48d6049001999c9f94cd4d3e9b0196994bed9a6a7437ffa3bc" - -UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" - -inherit cmake - -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.6.2.bb b/meta/recipes-devtools/ccache/ccache_4.6.2.bb new file mode 100644 index 0000000000..dbac02243c --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache_4.6.2.bb @@ -0,0 +1,30 @@ +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=7a19377a02749d8a1281ed608169b0ee" + +DEPENDS = "zstd" + +SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \ + file://0001-xxhash.h-Fix-build-with-gcc-12.patch \ + file://0001-Include-time.h-for-time_t.patch \ + file://0002-config-Include-sys-types.h-for-mode_t-defintion.patch \ +" +SRC_URI[sha256sum] = "6a746a9bed01585388b68e2d58af2e77741fc8d66bc360b5a0b4c41fc284dafe" + +UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" + +inherit cmake + +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-Include-time.h-for-time_t.patch b/meta/recipes-devtools/ccache/files/0001-Include-time.h-for-time_t.patch index 6c1d3cf4f9..d752eb0651 100644 --- a/meta/recipes-devtools/ccache/files/0001-Include-time.h-for-time_t.patch +++ b/meta/recipes-devtools/ccache/files/0001-Include-time.h-for-time_t.patch @@ -1,4 +1,4 @@ -From 3d3364221c235c733436abaeeea9b5e6813b06ae Mon Sep 17 00:00:00 2001 +From 590c656838a9b3769a7a855fb1891bfa8d8878ad Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Tue, 23 Aug 2022 10:27:21 -0700 Subject: [PATCH] Include time.h for time_t @@ -10,22 +10,20 @@ src/core/Statistics.hpp:41:37: error: 'time_t' has not been declared Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1145] Signed-off-by: Khem Raj + --- src/core/Statistics.hpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/core/Statistics.hpp b/src/core/Statistics.hpp -index 3e9ed816..0017f209 100644 +index 54f32e9..eb80e1c 100644 --- a/src/core/Statistics.hpp +++ b/src/core/Statistics.hpp -@@ -20,6 +20,7 @@ - +@@ -21,6 +21,7 @@ #include + #include +#include #include #include #include --- -2.37.2 - 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 aab943459d..67c74a1e8e 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 cfde5ba7d10ae1e9d0c259dd1e7027e9bad8f83c Mon Sep 17 00:00:00 2001 +From 550834a3ec2e05e379be63b084e7fa06a1723f84 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 @@ -17,6 +17,7 @@ Remove inline attribute to fix below build failure: 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(-) @@ -34,6 +35,3 @@ index 08ab794..c754e99 100644 # define XXH_NO_INLINE static __attribute__((noinline)) #elif defined(_MSC_VER) /* Visual Studio */ # define XXH_FORCE_INLINE static __forceinline --- -2.25.1 - diff --git a/meta/recipes-devtools/ccache/files/0002-config-Include-sys-types.h-for-mode_t-defintion.patch b/meta/recipes-devtools/ccache/files/0002-config-Include-sys-types.h-for-mode_t-defintion.patch new file mode 100644 index 0000000000..0fd77602df --- /dev/null +++ b/meta/recipes-devtools/ccache/files/0002-config-Include-sys-types.h-for-mode_t-defintion.patch @@ -0,0 +1,25 @@ +From f98b390a2d323f7f92fb0492b0943d201afe5b8f Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Tue, 23 Aug 2022 10:40:53 -0700 +Subject: [PATCH] config: Include sys/types.h for mode_t defintion + +Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1145] +Signed-off-by: Khem Raj + +--- + src/Config.hpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/Config.hpp b/src/Config.hpp +index a9e08ec..9e7af40 100644 +--- a/src/Config.hpp ++++ b/src/Config.hpp +@@ -25,6 +25,8 @@ + + #include "third_party/nonstd/optional.hpp" + ++#include ++ + #include + #include + #include -- cgit v1.2.3-54-g00ecf