diff mbox series

[03/24] ccache: upgrade 4.6.2 -> 4.6.3

Message ID 20220916210818.1228761-3-richard.purdie@linuxfoundation.org
State Accepted, archived
Commit 01ff58d9174eb81ae8f774600702bb0cb3b405a1
Headers show
Series [01/24] autoconf-archive: upgrade 2022.02.11 -> 2022.09.03 | expand

Commit Message

Richard Purdie Sept. 16, 2022, 9:07 p.m. UTC 
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---
 .../{ccache_4.6.2.bb => ccache_4.6.3.bb}      |  6 ++--
 .../0001-Include-time.h-for-time_t.patch      | 29 -------------------
 ...ude-sys-types.h-for-mode_t-defintion.patch | 25 ----------------
 3 files changed, 2 insertions(+), 58 deletions(-)
 rename meta/recipes-devtools/ccache/{ccache_4.6.2.bb => ccache_4.6.3.bb} (80%)
 delete mode 100644 meta/recipes-devtools/ccache/files/0001-Include-time.h-for-time_t.patch
 delete mode 100644 meta/recipes-devtools/ccache/files/0002-config-Include-sys-types.h-for-mode_t-defintion.patch
diff mbox series

Patch

diff --git a/meta/recipes-devtools/ccache/ccache_4.6.2.bb b/meta/recipes-devtools/ccache/ccache_4.6.3.bb
similarity index 80%
rename from meta/recipes-devtools/ccache/ccache_4.6.2.bb
rename to meta/recipes-devtools/ccache/ccache_4.6.3.bb
index dbac02243c0..5ed46cdc19e 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"
 
 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"
+           "
+SRC_URI[sha256sum] = "f46ba3706ad80c30d4d5874dee2bf9227a7fcd0ccaac31b51919a3053d84bd05"
 
 UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/"
 
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 d752eb06512..00000000000
--- a/meta/recipes-devtools/ccache/files/0001-Include-time.h-for-time_t.patch
+++ /dev/null
@@ -1,29 +0,0 @@ 
-From 590c656838a9b3769a7a855fb1891bfa8d8878ad Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Tue, 23 Aug 2022 10:27:21 -0700
-Subject: [PATCH] Include time.h for time_t
-
-Fixes
-src/core/Statistics.hpp:41:37: error: 'time_t' has not been declared
-|    41 |                                     time_t last_updated,
-|       |                                     ^~~~~~
-
-Upstream-Status: Submitted [https://github.com/ccache/ccache/pull/1145]
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
-
----
- src/core/Statistics.hpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/core/Statistics.hpp b/src/core/Statistics.hpp
-index 54f32e9..eb80e1c 100644
---- a/src/core/Statistics.hpp
-+++ b/src/core/Statistics.hpp
-@@ -21,6 +21,7 @@
- #include <core/StatisticsCounters.hpp>
- 
- #include <cstdint>
-+#include <ctime>
- #include <string>
- #include <unordered_map>
- #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 0fd77602df5..00000000000
--- a/meta/recipes-devtools/ccache/files/0002-config-Include-sys-types.h-for-mode_t-defintion.patch
+++ /dev/null
@@ -1,25 +0,0 @@ 
-From f98b390a2d323f7f92fb0492b0943d201afe5b8f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-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 <raj.khem@gmail.com>
-
----
- 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 <sys/types.h>
-+
- #include <cstdint>
- #include <functional>
- #include <limits>