summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Jansa <Martin.Jansa@gmail.com>2023-05-18 11:33:00 +0200
committerArmin Kuster <akuster808@gmail.com>2023-05-19 09:46:05 -0400
commitac933b0d1e21a4b3f883622939381b521649db67 (patch)
treeb705d33afe1add6ad4b8b4c49ba20264965e1297
parent9e539aaed608a03b1128a7361426703d8f9ba705 (diff)
downloadmeta-openembedded-ac933b0d1e21a4b3f883622939381b521649db67.tar.gz
abseil-cpp: backport a fix for build with gcc-13
* needed for abseil-cpp-native on hosts with gcc-13" Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-strings-internal-str_format-extension.h-add-mis.patch31
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-strings-internal-str_format-extension.h-add-mis.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-strings-internal-str_format-extension.h-add-mis.patch
new file mode 100644
index 0000000000..88f3816b0f
--- /dev/null
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0001-absl-strings-internal-str_format-extension.h-add-mis.patch
@@ -0,0 +1,31 @@
1From b436bc4ef31e29d73363d60b84e77eb419f46c50 Mon Sep 17 00:00:00 2001
2From: Sergei Trofimovich <slyich@gmail.com>
3Date: Fri, 27 May 2022 22:27:58 +0100
4Subject: [PATCH] absl/strings/internal/str_format/extension.h: add missing
5 <stdint.h> include
6
7Without the change absl-cpp build fails on this week's gcc-13 snapshot as:
8
9 /build/abseil-cpp/absl/strings/internal/str_format/extension.h:34:33: error: found ':' in nested-name-specifier, expected '::'
10 34 | enum class FormatConversionChar : uint8_t;
11 | ^
12 | ::
13
14Upstream-Status: Backport [20220623.0 36a4b073f1e7e02ed7d1ac140767e36f82f09b7c]
15Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
16---
17 absl/strings/internal/str_format/extension.h | 1 +
18 1 file changed, 1 insertion(+)
19
20diff --git a/absl/strings/internal/str_format/extension.h b/absl/strings/internal/str_format/extension.h
21index c47536d6..08c3fbeb 100644
22--- a/absl/strings/internal/str_format/extension.h
23+++ b/absl/strings/internal/str_format/extension.h
24@@ -17,6 +17,7 @@
25 #define ABSL_STRINGS_INTERNAL_STR_FORMAT_EXTENSION_H_
26
27 #include <limits.h>
28+#include <stdint.h>
29
30 #include <cstddef>
31 #include <cstring>
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb
index 1bb27d4369..30eef75ffb 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_git.bb
@@ -14,6 +14,7 @@ SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \
14 file://0001-absl-always-use-asm-sgidefs.h.patch \ 14 file://0001-absl-always-use-asm-sgidefs.h.patch \
15 file://0002-Remove-maes-option-from-cross-compilation.patch \ 15 file://0002-Remove-maes-option-from-cross-compilation.patch \
16 file://abseil-ppc-fixes.patch \ 16 file://abseil-ppc-fixes.patch \
17 file://0001-absl-strings-internal-str_format-extension.h-add-mis.patch \
17 " 18 "
18 19
19S = "${WORKDIR}/git" 20S = "${WORKDIR}/git"