summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/ccache
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-15 07:14:37 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2022-09-17 07:47:07 +0100
commit87c783d3752acd3513f2e3aedea6a598fef1d080 (patch)
treeea3d01efcbc56ddb2da79980951369874afc2a9f /meta/recipes-devtools/ccache
parentc4b7e9ae05e2a4c328f5cac42c6e210434b8f575 (diff)
downloadpoky-87c783d3752acd3513f2e3aedea6a598fef1d080.tar.gz
ccache: upgrade 4.6.2 -> 4.6.3
(From OE-Core rev: 01ff58d9174eb81ae8f774600702bb0cb3b405a1) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/ccache')
-rw-r--r--meta/recipes-devtools/ccache/ccache_4.6.3.bb (renamed from meta/recipes-devtools/ccache/ccache_4.6.2.bb)6
-rw-r--r--meta/recipes-devtools/ccache/files/0001-Include-time.h-for-time_t.patch29
-rw-r--r--meta/recipes-devtools/ccache/files/0002-config-Include-sys-types.h-for-mode_t-defintion.patch25
3 files changed, 2 insertions, 58 deletions
diff --git a/meta/recipes-devtools/ccache/ccache_4.6.2.bb b/meta/recipes-devtools/ccache/ccache_4.6.3.bb
index dbac02243c..5ed46cdc19 100644
--- a/meta/recipes-devtools/ccache/ccache_4.6.2.bb
+++ b/meta/recipes-devtools/ccache/ccache_4.6.3.bb
@@ -13,10 +13,8 @@ DEPENDS = "zstd"
13 13
14SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \ 14SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \
15 file://0001-xxhash.h-Fix-build-with-gcc-12.patch \ 15 file://0001-xxhash.h-Fix-build-with-gcc-12.patch \
16 file://0001-Include-time.h-for-time_t.patch \ 16 "
17 file://0002-config-Include-sys-types.h-for-mode_t-defintion.patch \ 17SRC_URI[sha256sum] = "f46ba3706ad80c30d4d5874dee2bf9227a7fcd0ccaac31b51919a3053d84bd05"
18"
19SRC_URI[sha256sum] = "6a746a9bed01585388b68e2d58af2e77741fc8d66bc360b5a0b4c41fc284dafe"
20 18
21UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" 19UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/"
22 20
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
deleted file mode 100644
index d752eb0651..0000000000
--- a/meta/recipes-devtools/ccache/files/0001-Include-time.h-for-time_t.patch
+++ /dev/null
@@ -1,29 +0,0 @@
1From 590c656838a9b3769a7a855fb1891bfa8d8878ad Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 23 Aug 2022 10:27:21 -0700
4Subject: [PATCH] Include time.h for time_t
5
6Fixes
7src/core/Statistics.hpp:41:37: error: 'time_t' has not been declared
8| 41 | time_t last_updated,
9| | ^~~~~~
10
11Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1145]
12Signed-off-by: Khem Raj <raj.khem@gmail.com>
13
14---
15 src/core/Statistics.hpp | 1 +
16 1 file changed, 1 insertion(+)
17
18diff --git a/src/core/Statistics.hpp b/src/core/Statistics.hpp
19index 54f32e9..eb80e1c 100644
20--- a/src/core/Statistics.hpp
21+++ b/src/core/Statistics.hpp
22@@ -21,6 +21,7 @@
23 #include <core/StatisticsCounters.hpp>
24
25 #include <cstdint>
26+#include <ctime>
27 #include <string>
28 #include <unordered_map>
29 #include <vector>
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
deleted file mode 100644
index 0fd77602df..0000000000
--- a/meta/recipes-devtools/ccache/files/0002-config-Include-sys-types.h-for-mode_t-defintion.patch
+++ /dev/null
@@ -1,25 +0,0 @@
1From f98b390a2d323f7f92fb0492b0943d201afe5b8f Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Tue, 23 Aug 2022 10:40:53 -0700
4Subject: [PATCH] config: Include sys/types.h for mode_t defintion
5
6Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1145]
7Signed-off-by: Khem Raj <raj.khem@gmail.com>
8
9---
10 src/Config.hpp | 2 ++
11 1 file changed, 2 insertions(+)
12
13diff --git a/src/Config.hpp b/src/Config.hpp
14index 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>