diff options
author | Khem Raj <raj.khem@gmail.com> | 2022-08-23 11:01:51 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2022-09-02 15:58:25 +0100 |
commit | 1d4ac06c850b37d129a522c6909f7babfcdbd9d9 (patch) | |
tree | 2e8deabb8f8c26f4e47fdf2d9b1f1da0f7cbfacd /meta/recipes-devtools/ccache/files | |
parent | 5ee00d7e6882929091e2fbd605d0e328a4df0821 (diff) | |
download | poky-1d4ac06c850b37d129a522c6909f7babfcdbd9d9.tar.gz |
ccache: Upgrade to 4.6.2
Fix build with musl
(From OE-Core rev: a76700a47c227e76551d2f2c86db5841ad7f6e8f)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ccache/files')
3 files changed, 32 insertions, 11 deletions
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 @@ | |||
1 | From 3d3364221c235c733436abaeeea9b5e6813b06ae Mon Sep 17 00:00:00 2001 | 1 | From 590c656838a9b3769a7a855fb1891bfa8d8878ad Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Tue, 23 Aug 2022 10:27:21 -0700 | 3 | Date: Tue, 23 Aug 2022 10:27:21 -0700 |
4 | Subject: [PATCH] Include time.h for time_t | 4 | 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 | |||
10 | 10 | ||
11 | Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1145] | 11 | Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1145] |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | src/core/Statistics.hpp | 1 + | 15 | src/core/Statistics.hpp | 1 + |
15 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
16 | 17 | ||
17 | diff --git a/src/core/Statistics.hpp b/src/core/Statistics.hpp | 18 | diff --git a/src/core/Statistics.hpp b/src/core/Statistics.hpp |
18 | index 3e9ed816..0017f209 100644 | 19 | index 54f32e9..eb80e1c 100644 |
19 | --- a/src/core/Statistics.hpp | 20 | --- a/src/core/Statistics.hpp |
20 | +++ b/src/core/Statistics.hpp | 21 | +++ b/src/core/Statistics.hpp |
21 | @@ -20,6 +20,7 @@ | 22 | @@ -21,6 +21,7 @@ |
22 | |||
23 | #include <core/StatisticsCounters.hpp> | 23 | #include <core/StatisticsCounters.hpp> |
24 | 24 | ||
25 | #include <cstdint> | ||
25 | +#include <ctime> | 26 | +#include <ctime> |
26 | #include <string> | 27 | #include <string> |
27 | #include <unordered_map> | 28 | #include <unordered_map> |
28 | #include <vector> | 29 | #include <vector> |
29 | -- | ||
30 | 2.37.2 | ||
31 | |||
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 @@ | |||
1 | From cfde5ba7d10ae1e9d0c259dd1e7027e9bad8f83c Mon Sep 17 00:00:00 2001 | 1 | From 550834a3ec2e05e379be63b084e7fa06a1723f84 Mon Sep 17 00:00:00 2001 |
2 | From: Mingli Yu <mingli.yu@windriver.com> | 2 | From: Mingli Yu <mingli.yu@windriver.com> |
3 | Date: Mon, 6 Jun 2022 17:53:20 +0800 | 3 | Date: Mon, 6 Jun 2022 17:53:20 +0800 |
4 | Subject: [PATCH] xxhash.h: Fix build with gcc-12 | 4 | Subject: [PATCH] xxhash.h: Fix build with gcc-12 |
@@ -17,6 +17,7 @@ Remove inline attribute to fix below build failure: | |||
17 | Upstream-Status: Submitted [https://github.com/Cyan4973/xxHash/pull/720] | 17 | Upstream-Status: Submitted [https://github.com/Cyan4973/xxHash/pull/720] |
18 | 18 | ||
19 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 19 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
20 | |||
20 | --- | 21 | --- |
21 | src/third_party/xxhash.h | 2 +- | 22 | src/third_party/xxhash.h | 2 +- |
22 | 1 file changed, 1 insertion(+), 1 deletion(-) | 23 | 1 file changed, 1 insertion(+), 1 deletion(-) |
@@ -34,6 +35,3 @@ index 08ab794..c754e99 100644 | |||
34 | # define XXH_NO_INLINE static __attribute__((noinline)) | 35 | # define XXH_NO_INLINE static __attribute__((noinline)) |
35 | #elif defined(_MSC_VER) /* Visual Studio */ | 36 | #elif defined(_MSC_VER) /* Visual Studio */ |
36 | # define XXH_FORCE_INLINE static __forceinline | 37 | # define XXH_FORCE_INLINE static __forceinline |
37 | -- | ||
38 | 2.25.1 | ||
39 | |||
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 @@ | |||
1 | From f98b390a2d323f7f92fb0492b0943d201afe5b8f Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Tue, 23 Aug 2022 10:40:53 -0700 | ||
4 | Subject: [PATCH] config: Include sys/types.h for mode_t defintion | ||
5 | |||
6 | Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1145] | ||
7 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
8 | |||
9 | --- | ||
10 | src/Config.hpp | 2 ++ | ||
11 | 1 file changed, 2 insertions(+) | ||
12 | |||
13 | diff --git a/src/Config.hpp b/src/Config.hpp | ||
14 | index a9e08ec..9e7af40 100644 | ||
15 | --- a/src/Config.hpp | ||
16 | +++ b/src/Config.hpp | ||
17 | @@ -25,6 +25,8 @@ | ||
18 | |||
19 | #include "third_party/nonstd/optional.hpp" | ||
20 | |||
21 | +#include <sys/types.h> | ||
22 | + | ||
23 | #include <cstdint> | ||
24 | #include <functional> | ||
25 | #include <limits> | ||