diff options
| -rw-r--r-- | meta/recipes-devtools/ccache/ccache/0001-build-Fix-FTBFS-with-not-yet-released-GCC-13.patch | 92 | ||||
| -rw-r--r-- | meta/recipes-devtools/ccache/ccache_4.6.bb | 4 |
2 files changed, 95 insertions, 1 deletions
diff --git a/meta/recipes-devtools/ccache/ccache/0001-build-Fix-FTBFS-with-not-yet-released-GCC-13.patch b/meta/recipes-devtools/ccache/ccache/0001-build-Fix-FTBFS-with-not-yet-released-GCC-13.patch new file mode 100644 index 0000000000..d62e1ef26b --- /dev/null +++ b/meta/recipes-devtools/ccache/ccache/0001-build-Fix-FTBFS-with-not-yet-released-GCC-13.patch | |||
| @@ -0,0 +1,92 @@ | |||
| 1 | From 1523eaeff4669e421b3f60618b43c878e4860fe6 Mon Sep 17 00:00:00 2001 | ||
| 2 | From: Joel Rosdahl <joel@rosdahl.net> | ||
| 3 | Date: Tue, 5 Jul 2022 21:42:58 +0200 | ||
| 4 | Subject: [PATCH] build: Fix FTBFS with not yet released GCC 13 | ||
| 5 | |||
| 6 | Reference: https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes | ||
| 7 | |||
| 8 | Fixes #1105. | ||
| 9 | |||
| 10 | Upstream-Status: Backport [v4.7 https://github.com/ccache/ccache/commit/19ef6e267d38d4d8b3e11c915213472d5662d593] | ||
| 11 | Signed-off-by: Martin Jansa <martin.jansa@gmail.com> | ||
| 12 | --- | ||
| 13 | src/Stat.hpp | 1 + | ||
| 14 | src/core/CacheEntryHeader.hpp | 2 ++ | ||
| 15 | src/core/Sloppiness.hpp | 1 + | ||
| 16 | src/core/Statistics.hpp | 3 ++- | ||
| 17 | src/util/TextTable.hpp | 3 ++- | ||
| 18 | 5 files changed, 8 insertions(+), 2 deletions(-) | ||
| 19 | |||
| 20 | diff --git a/src/Stat.hpp b/src/Stat.hpp | ||
| 21 | index 2f56214a..074cdeeb 100644 | ||
| 22 | --- a/src/Stat.hpp | ||
| 23 | +++ b/src/Stat.hpp | ||
| 24 | @@ -23,6 +23,7 @@ | ||
| 25 | #include <sys/stat.h> | ||
| 26 | #include <sys/types.h> | ||
| 27 | |||
| 28 | +#include <cstdint> | ||
| 29 | #include <ctime> | ||
| 30 | #include <string> | ||
| 31 | |||
| 32 | diff --git a/src/core/CacheEntryHeader.hpp b/src/core/CacheEntryHeader.hpp | ||
| 33 | index 4c3e04c7..dcc32e1c 100644 | ||
| 34 | --- a/src/core/CacheEntryHeader.hpp | ||
| 35 | +++ b/src/core/CacheEntryHeader.hpp | ||
| 36 | @@ -21,6 +21,8 @@ | ||
| 37 | #include <compression/types.hpp> | ||
| 38 | #include <core/types.hpp> | ||
| 39 | |||
| 40 | +#include <cstdint> | ||
| 41 | + | ||
| 42 | // Cache entry format | ||
| 43 | // ================== | ||
| 44 | // | ||
| 45 | diff --git a/src/core/Sloppiness.hpp b/src/core/Sloppiness.hpp | ||
| 46 | index 917526bf..1ab31d71 100644 | ||
| 47 | --- a/src/core/Sloppiness.hpp | ||
| 48 | +++ b/src/core/Sloppiness.hpp | ||
| 49 | @@ -18,6 +18,7 @@ | ||
| 50 | |||
| 51 | #pragma once | ||
| 52 | |||
| 53 | +#include <cstdint> | ||
| 54 | #include <string> | ||
| 55 | |||
| 56 | namespace core { | ||
| 57 | diff --git a/src/core/Statistics.hpp b/src/core/Statistics.hpp | ||
| 58 | index 3e9ed816..54f32e9c 100644 | ||
| 59 | --- a/src/core/Statistics.hpp | ||
| 60 | +++ b/src/core/Statistics.hpp | ||
| 61 | @@ -1,4 +1,4 @@ | ||
| 62 | -// Copyright (C) 2020-2021 Joel Rosdahl and other contributors | ||
| 63 | +// Copyright (C) 2020-2022 Joel Rosdahl and other contributors | ||
| 64 | // | ||
| 65 | // See doc/AUTHORS.adoc for a complete list of contributors. | ||
| 66 | // | ||
| 67 | @@ -20,6 +20,7 @@ | ||
| 68 | |||
| 69 | #include <core/StatisticsCounters.hpp> | ||
| 70 | |||
| 71 | +#include <cstdint> | ||
| 72 | #include <string> | ||
| 73 | #include <unordered_map> | ||
| 74 | #include <vector> | ||
| 75 | diff --git a/src/util/TextTable.hpp b/src/util/TextTable.hpp | ||
| 76 | index 05c0e0e5..60edee75 100644 | ||
| 77 | --- a/src/util/TextTable.hpp | ||
| 78 | +++ b/src/util/TextTable.hpp | ||
| 79 | @@ -1,4 +1,4 @@ | ||
| 80 | -// Copyright (C) 2021 Joel Rosdahl and other contributors | ||
| 81 | +// Copyright (C) 2021-2022 Joel Rosdahl and other contributors | ||
| 82 | // | ||
| 83 | // See doc/AUTHORS.adoc for a complete list of contributors. | ||
| 84 | // | ||
| 85 | @@ -18,6 +18,7 @@ | ||
| 86 | |||
| 87 | #pragma once | ||
| 88 | |||
| 89 | +#include <cstdint> | ||
| 90 | #include <string> | ||
| 91 | #include <vector> | ||
| 92 | |||
diff --git a/meta/recipes-devtools/ccache/ccache_4.6.bb b/meta/recipes-devtools/ccache/ccache_4.6.bb index f019679cf1..d94c5d591a 100644 --- a/meta/recipes-devtools/ccache/ccache_4.6.bb +++ b/meta/recipes-devtools/ccache/ccache_4.6.bb | |||
| @@ -11,7 +11,9 @@ LIC_FILES_CHKSUM = "file://LICENSE.adoc;md5=ff5327dc93e2b286c931dda3d6079da9" | |||
| 11 | 11 | ||
| 12 | DEPENDS = "zstd" | 12 | DEPENDS = "zstd" |
| 13 | 13 | ||
| 14 | SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz" | 14 | SRC_URI = "https://github.com/ccache/ccache/releases/download/v${PV}/${BP}.tar.gz \ |
| 15 | file://0001-build-Fix-FTBFS-with-not-yet-released-GCC-13.patch \ | ||
| 16 | " | ||
| 15 | SRC_URI[sha256sum] = "73a1767ac6b7c0404a1a55f761a746d338e702883c7137fbf587023062258625" | 17 | SRC_URI[sha256sum] = "73a1767ac6b7c0404a1a55f761a746d338e702883c7137fbf587023062258625" |
| 16 | 18 | ||
| 17 | UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" | 19 | UPSTREAM_CHECK_URI = "https://github.com/ccache/ccache/releases/" |
