mirror of
https://github.com/openwrt/openwrt.git
synced 2025-02-21 01:41:41 +00:00
tools/ccache: fix build with musl and gcc 12
* refresh patches Signed-off-by: Michal Vasilek <michal.vasilek@nic.cz>
This commit is contained in:
parent
8e43a44f08
commit
3de4572ed3
@ -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
|
||||
|
32
tools/ccache/patches/110-musl-gcc12.patch
Normal file
32
tools/ccache/patches/110-musl-gcc12.patch
Normal file
@ -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>
|
||||
|
Loading…
x
Reference in New Issue
Block a user