summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch38
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch (renamed from meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch)0
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch49
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Fix-GCC15-warning-that-ciso646-is-deprecated-in-C-17.patch43
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb (renamed from meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250127.1.bb)9
5 files changed, 3 insertions, 136 deletions
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch
deleted file mode 100644
index d49e860f21..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From a573ccd57e713486e7d8e782d6b3b34fde01ff9e Mon Sep 17 00:00:00 2001
2From: Sinan Kaya <sinan.kaya@microsoft.com>
3Date: Mon, 3 Feb 2020 03:25:57 +0000
4Subject: [PATCH] Remove maes option from cross-compilation
5
6Upstream-Status: Pending
7---
8 absl/copts/GENERATED_AbseilCopts.cmake | 4 ----
9 absl/copts/GENERATED_copts.bzl | 4 ----
10 2 files changed, 8 deletions(-)
11
12diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
13index da2282fe..5e0e8dfd 100644
14--- a/absl/copts/GENERATED_AbseilCopts.cmake
15+++ b/absl/copts/GENERATED_AbseilCopts.cmake
16@@ -229,7 +229,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
17 list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS
18 )
19
20-list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS
21- "-maes"
22- "-msse4.1"
23-)
24diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
25index b9e0071e..0072008c 100644
26--- a/absl/copts/GENERATED_copts.bzl
27+++ b/absl/copts/GENERATED_copts.bzl
28@@ -230,7 +230,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [
29 ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [
30 ]
31
32-ABSL_RANDOM_HWAES_X64_FLAGS = [
33- "-maes",
34- "-msse4.1",
35-]
36--
372.25.1
38
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch
index a0b99dd206..a0b99dd206 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-abseil-ppc-fixes.patch
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch
deleted file mode 100644
index c82b9e1b51..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch
+++ /dev/null
@@ -1,49 +0,0 @@
1From 632632508daf8bb3a5800dac937ffc33c6d85973 Mon Sep 17 00:00:00 2001
2From: Jonas Gorski <jonas.gorski@bisdn.de>
3Date: Thu, 16 Jun 2022 11:46:31 +0000
4Subject: [PATCH] Remove neon option from cross compilation
5
6Not every arm platform supports neon instructions, so do not enforce
7them.
8
9Upstream-Status: Pending
10
11Signed-off-by: Jonas Gorski <jonas.gorski@bisdn.de>
12---
13 absl/copts/GENERATED_AbseilCopts.cmake | 4 ----
14 absl/copts/GENERATED_copts.bzl | 4 ----
15 2 files changed, 8 deletions(-)
16
17diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake
18index 5e0e8dfd..57cfc4d3 100644
19--- a/absl/copts/GENERATED_AbseilCopts.cmake
20+++ b/absl/copts/GENERATED_AbseilCopts.cmake
21@@ -218,10 +218,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS
22 "/DNOMINMAX"
23 )
24
25-list(APPEND ABSL_RANDOM_HWAES_ARM32_FLAGS
26- "-mfpu=neon"
27-)
28-
29 list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS
30 "-march=armv8-a+crypto"
31 )
32diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl
33index 0072008c..72840fda 100644
34--- a/absl/copts/GENERATED_copts.bzl
35+++ b/absl/copts/GENERATED_copts.bzl
36@@ -219,10 +219,6 @@ ABSL_MSVC_TEST_FLAGS = [
37 "/DNOMINMAX",
38 ]
39
40-ABSL_RANDOM_HWAES_ARM32_FLAGS = [
41- "-mfpu=neon",
42-]
43-
44 ABSL_RANDOM_HWAES_ARM64_FLAGS = [
45 "-march=armv8-a+crypto",
46 ]
47--
482.25.1
49
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Fix-GCC15-warning-that-ciso646-is-deprecated-in-C-17.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Fix-GCC15-warning-that-ciso646-is-deprecated-in-C-17.patch
deleted file mode 100644
index 7fe9ab4708..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Fix-GCC15-warning-that-ciso646-is-deprecated-in-C-17.patch
+++ /dev/null
@@ -1,43 +0,0 @@
1From aa102147cdfff3aa971e61038a6455bff6828350 Mon Sep 17 00:00:00 2001
2From: Derek Mauro <dmauro@google.com>
3Date: Tue, 29 Apr 2025 06:23:36 -0700
4Subject: [PATCH] Fix GCC15 warning that <ciso646> is deprecated in C++17
5
6PiperOrigin-RevId: 752709743
7Change-Id: I4d6b52bca913d888818e1380268089743b03ca2b
8Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/5f3435aba00bcd7f12062d2e8e1839b4eaf1a575]
9---
10 absl/hash/internal/hash.h | 14 +++++++++++++-
11 1 file changed, 13 insertions(+), 1 deletion(-)
12
13diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h
14index f4a0d785..6937f413 100644
15--- a/absl/hash/internal/hash.h
16+++ b/absl/hash/internal/hash.h
17@@ -26,13 +26,25 @@
18
19 #include "absl/base/config.h"
20
21+// GCC15 warns that <ciso646> is deprecated in C++17 and suggests using
22+// <version> instead, even though <version> is not available in C++17 mode prior
23+// to GCC9.
24+#if defined(__has_include)
25+#if __has_include(<version>)
26+#define ABSL_INTERNAL_VERSION_HEADER_AVAILABLE 1
27+#endif
28+#endif
29+
30 // For feature testing and determining which headers can be included.
31-#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L
32+#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L || \
33+ ABSL_INTERNAL_VERSION_HEADER_AVAILABLE
34 #include <version>
35 #else
36 #include <ciso646>
37 #endif
38
39+#undef ABSL_INTERNAL_VERSION_HEADER_AVAILABLE
40+
41 #include <algorithm>
42 #include <array>
43 #include <bitset>
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250127.1.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
index 39c3b0b6db..7d8b813e5f 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250127.1.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250512.1.bb
@@ -7,14 +7,11 @@ SECTION = "libs"
7LICENSE = "Apache-2.0" 7LICENSE = "Apache-2.0"
8LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" 8LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915"
9 9
10SRCREV = "d9e4955c65cd4367dd6bf46f4ccb8cd3d100540b" 10SRCREV = "76bb24329e8bf5f39704eb10d21b9a80befa7c81"
11BRANCH = "lts_2025_01_27" 11BRANCH = "lts_2025_05_12"
12SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ 12SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \
13 file://0001-absl-always-use-asm-sgidefs.h.patch \ 13 file://0001-absl-always-use-asm-sgidefs.h.patch \
14 file://0002-Remove-maes-option-from-cross-compilation.patch \ 14 file://0002-abseil-ppc-fixes.patch \
15 file://0003-Remove-neon-option-from-cross-compilation.patch \
16 file://0004-abseil-ppc-fixes.patch \
17 file://0005-Fix-GCC15-warning-that-ciso646-is-deprecated-in-C-17.patch \
18 " 15 "
19 16
20S = "${WORKDIR}/git" 17S = "${WORKDIR}/git"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-12-10 20:45:47 +0000