From: Michal Vasilek <michal.vasilek@nic.cz>
Date: Thu, 8 Dec 2022 12:56:45 +0000 (+0100)
Subject: tools/ccache: fix build with musl and gcc 12
X-Git-Tag: v22.03.3~31
X-Git-Url: http://git.openwrt.org/openwrt/feeds.git?a=commitdiff_plain;h=3de4572ed30865450047c0b2641afae20bcced15;p=openwrt%2Fstaging%2Fpepe2k.git

tools/ccache: fix build with musl and gcc 12

* refresh patches

Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
---

diff --git a/tools/ccache/patches/100-honour-copts.patch b/tools/ccache/patches/100-honour-copts.patch
index 55422985b7..a7fe4e4ec6 100644
--- a/tools/ccache/patches/100-honour-copts.patch
+++ b/tools/ccache/patches/100-honour-copts.patch
@@ -1,6 +1,6 @@
 --- a/src/ccache.cpp
 +++ b/src/ccache.cpp
-@@ -1633,6 +1633,7 @@ calculate_result_and_manifest_key(Contex
+@@ -1738,6 +1738,7 @@ calculate_result_and_manifest_key(Contex
                               "CPLUS_INCLUDE_PATH",
                               "OBJC_INCLUDE_PATH",
                               "OBJCPLUS_INCLUDE_PATH", // clang
diff --git a/tools/ccache/patches/110-musl-gcc12.patch b/tools/ccache/patches/110-musl-gcc12.patch
new file mode 100644
index 0000000000..01229ed475
--- /dev/null
+++ b/tools/ccache/patches/110-musl-gcc12.patch
@@ -0,0 +1,32 @@
+From a69bdc87d7a4a7b019c4086cb007a0b48a007f4a Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Thu, 25 Aug 2022 12:36:18 -0700
+Subject: [PATCH] fix: Fix build with musl when using GCC 12 (#1145)
+
+(cherry picked from commit bb72cc26bc91bc56567dbef608088a9437f836bb)
+---
+ src/Config.hpp          | 2 ++
+ src/core/Statistics.hpp | 1 +
+ 2 files changed, 3 insertions(+)
+
+--- 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>
+--- a/src/core/Statistics.hpp
++++ b/src/core/Statistics.hpp
+@@ -21,6 +21,7 @@
+ #include <core/StatisticsCounters.hpp>
+ 
+ #include <string>
++#include <ctime>
+ #include <unordered_map>
+ #include <vector>
+