From e8c0e64e89b565a55d4c4fefe30a90a25fbe5831 Mon Sep 17 00:00:00 2001 From: Willy Tu Date: Mon, 16 Jun 2025 20:46:44 +0000 Subject: [PATCH] abseil-cpp: upgrade 20250127.1 -> 20250512.0 Refreshed abseil-cpp/0004-abseil-ppc-fixes.patch for 20250512.0 Change related to abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch are removed in https://github.com/abseil/abseil-cpp/commit/ea9951d3a9ac16db02fdd196b5164720f57df63a abseil-cpp/0005-Fix-GCC15-warning-that-ciso646-is-deprecated-in-C-17.patch is submitted in https://github.com/abseil/abseil-cpp/commit/5f3435aba00bcd7f12062d2e8e1839b4eaf1a575 Signed-off-by: Willy Tu Signed-off-by: Khem Raj --- ...e-maes-option-from-cross-compilation.patch | 38 -------------- ...ixes.patch => 0002-abseil-ppc-fixes.patch} | 0 ...e-neon-option-from-cross-compilation.patch | 49 ------------------- ...g-that-ciso646-is-deprecated-in-C-17.patch | 43 ---------------- ...20250127.1.bb => abseil-cpp_20250512.1.bb} | 9 ++-- 5 files changed, 3 insertions(+), 136 deletions(-) delete mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0002-Remove-maes-option-from-cross-compilation.patch rename meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/{0004-abseil-ppc-fixes.patch => 0002-abseil-ppc-fixes.patch} (100%) delete mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0003-Remove-neon-option-from-cross-compilation.patch delete mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Fix-GCC15-warning-that-ciso646-is-deprecated-in-C-17.patch rename meta-oe/recipes-devtools/abseil-cpp/{abseil-cpp_20250127.1.bb => abseil-cpp_20250512.1.bb} (79%) 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 @@ -From a573ccd57e713486e7d8e782d6b3b34fde01ff9e Mon Sep 17 00:00:00 2001 -From: Sinan Kaya -Date: Mon, 3 Feb 2020 03:25:57 +0000 -Subject: [PATCH] Remove maes option from cross-compilation - -Upstream-Status: Pending ---- - absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- - absl/copts/GENERATED_copts.bzl | 4 ---- - 2 files changed, 8 deletions(-) - -diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake -index da2282fe..5e0e8dfd 100644 ---- a/absl/copts/GENERATED_AbseilCopts.cmake -+++ b/absl/copts/GENERATED_AbseilCopts.cmake -@@ -229,7 +229,3 @@ list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS - list(APPEND ABSL_RANDOM_HWAES_MSVC_X64_FLAGS - ) - --list(APPEND ABSL_RANDOM_HWAES_X64_FLAGS -- "-maes" -- "-msse4.1" --) -diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl -index b9e0071e..0072008c 100644 ---- a/absl/copts/GENERATED_copts.bzl -+++ b/absl/copts/GENERATED_copts.bzl -@@ -230,7 +230,3 @@ ABSL_RANDOM_HWAES_ARM64_FLAGS = [ - ABSL_RANDOM_HWAES_MSVC_X64_FLAGS = [ - ] - --ABSL_RANDOM_HWAES_X64_FLAGS = [ -- "-maes", -- "-msse4.1", --] --- -2.25.1 - 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 similarity index 100% rename from meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0004-abseil-ppc-fixes.patch rename to 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 @@ -From 632632508daf8bb3a5800dac937ffc33c6d85973 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski -Date: Thu, 16 Jun 2022 11:46:31 +0000 -Subject: [PATCH] Remove neon option from cross compilation - -Not every arm platform supports neon instructions, so do not enforce -them. - -Upstream-Status: Pending - -Signed-off-by: Jonas Gorski ---- - absl/copts/GENERATED_AbseilCopts.cmake | 4 ---- - absl/copts/GENERATED_copts.bzl | 4 ---- - 2 files changed, 8 deletions(-) - -diff --git a/absl/copts/GENERATED_AbseilCopts.cmake b/absl/copts/GENERATED_AbseilCopts.cmake -index 5e0e8dfd..57cfc4d3 100644 ---- a/absl/copts/GENERATED_AbseilCopts.cmake -+++ b/absl/copts/GENERATED_AbseilCopts.cmake -@@ -218,10 +218,6 @@ list(APPEND ABSL_MSVC_TEST_FLAGS - "/DNOMINMAX" - ) - --list(APPEND ABSL_RANDOM_HWAES_ARM32_FLAGS -- "-mfpu=neon" --) -- - list(APPEND ABSL_RANDOM_HWAES_ARM64_FLAGS - "-march=armv8-a+crypto" - ) -diff --git a/absl/copts/GENERATED_copts.bzl b/absl/copts/GENERATED_copts.bzl -index 0072008c..72840fda 100644 ---- a/absl/copts/GENERATED_copts.bzl -+++ b/absl/copts/GENERATED_copts.bzl -@@ -219,10 +219,6 @@ ABSL_MSVC_TEST_FLAGS = [ - "/DNOMINMAX", - ] - --ABSL_RANDOM_HWAES_ARM32_FLAGS = [ -- "-mfpu=neon", --] -- - ABSL_RANDOM_HWAES_ARM64_FLAGS = [ - "-march=armv8-a+crypto", - ] --- -2.25.1 - 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 @@ -From aa102147cdfff3aa971e61038a6455bff6828350 Mon Sep 17 00:00:00 2001 -From: Derek Mauro -Date: Tue, 29 Apr 2025 06:23:36 -0700 -Subject: [PATCH] Fix GCC15 warning that is deprecated in C++17 - -PiperOrigin-RevId: 752709743 -Change-Id: I4d6b52bca913d888818e1380268089743b03ca2b -Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/5f3435aba00bcd7f12062d2e8e1839b4eaf1a575] ---- - absl/hash/internal/hash.h | 14 +++++++++++++- - 1 file changed, 13 insertions(+), 1 deletion(-) - -diff --git a/absl/hash/internal/hash.h b/absl/hash/internal/hash.h -index f4a0d785..6937f413 100644 ---- a/absl/hash/internal/hash.h -+++ b/absl/hash/internal/hash.h -@@ -26,13 +26,25 @@ - - #include "absl/base/config.h" - -+// GCC15 warns that is deprecated in C++17 and suggests using -+// instead, even though is not available in C++17 mode prior -+// to GCC9. -+#if defined(__has_include) -+#if __has_include() -+#define ABSL_INTERNAL_VERSION_HEADER_AVAILABLE 1 -+#endif -+#endif -+ - // For feature testing and determining which headers can be included. --#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L -+#if ABSL_INTERNAL_CPLUSPLUS_LANG >= 202002L || \ -+ ABSL_INTERNAL_VERSION_HEADER_AVAILABLE - #include - #else - #include - #endif - -+#undef ABSL_INTERNAL_VERSION_HEADER_AVAILABLE -+ - #include - #include - #include 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 similarity index 79% rename from meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250127.1.bb rename to 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" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915" -SRCREV = "d9e4955c65cd4367dd6bf46f4ccb8cd3d100540b" -BRANCH = "lts_2025_01_27" +SRCREV = "76bb24329e8bf5f39704eb10d21b9a80befa7c81" +BRANCH = "lts_2025_05_12" SRC_URI = "git://github.com/abseil/abseil-cpp;branch=${BRANCH};protocol=https \ file://0001-absl-always-use-asm-sgidefs.h.patch \ - file://0002-Remove-maes-option-from-cross-compilation.patch \ - file://0003-Remove-neon-option-from-cross-compilation.patch \ - file://0004-abseil-ppc-fixes.patch \ - file://0005-Fix-GCC15-warning-that-ciso646-is-deprecated-in-C-17.patch \ + file://0002-abseil-ppc-fixes.patch \ " S = "${WORKDIR}/git"