diff mbox series

[meta-oe] abseil-cpp: upgrade 20240722.0 -> 20250127.0

Message ID 20250227031437.3580059-1-changqing.li@windriver.com
State Accepted
Headers show
Series [meta-oe] abseil-cpp: upgrade 20240722.0 -> 20250127.0 | expand

Commit Message

Changqing Li Feb. 27, 2025, 3:14 a.m. UTC 
From: Changqing Li <changqing.li@windriver.com>

Upgrade to the latest new LTS release, release note:
https://github.com/abseil/abseil-cpp/releases?page=1

* drop 0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch,
already include in this LTS release
* Include security fix for CVE-2025-0838

Signed-off-by: Changqing Li <changqing.li@windriver.com>
---
 ...-virtual-dtor-in-the-flags-are-neede.patch | 30 -------------------
 ...20240722.0.bb => abseil-cpp_20250127.0.bb} |  5 ++--
 2 files changed, 2 insertions(+), 33 deletions(-)
 delete mode 100644 meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch
 rename meta-oe/recipes-devtools/abseil-cpp/{abseil-cpp_20240722.0.bb => abseil-cpp_20250127.0.bb} (90%)
diff mbox series

Patch

diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch
deleted file mode 100644
index 9a4fc0b43f..0000000000
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch
+++ /dev/null
@@ -1,30 +0,0 @@ 
-From 9cb5e5d15c142e5cc43a2c1db87c8e4e5b6d38a5 Mon Sep 17 00:00:00 2001
-From: Derek Mauro <dmauro@google.com>
-Date: Mon, 5 Aug 2024 07:35:05 -0700
-Subject: [PATCH] Don't match -Wnon-virtual-dtor in the "flags are needed to
- suppress warnings in headers". It should fall through to the "don't impose
- our warnings on others" case. Do this by matching on "-Wno-*" instead of
- "-Wno*".
-
-Fixes #1737
-
-PiperOrigin-RevId: 659548798
-Change-Id: I49d7ba7ddcd7be30f946fca90ba9be467181e854
-Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/9cb5e5d15c142e5cc43a2c1db87c8e4e5b6d38a5]
----
- CMake/AbseilHelpers.cmake | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
-index b177e590..3c4c92fe 100644
---- a/CMake/AbseilHelpers.cmake
-+++ b/CMake/AbseilHelpers.cmake
-@@ -195,7 +195,7 @@ function(absl_cc_library)
-         # specified platform. Filter both of them out before the successor
-         # reaches the "^-m" filter.
-         set(skip_next_cflag ON)
--      elseif(${cflag} MATCHES "^(-Wno|/wd)")
-+      elseif(${cflag} MATCHES "^(-Wno-|/wd)")
-         # These flags are needed to suppress warnings that might fire in our headers.
-         set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
-       elseif(${cflag} MATCHES "^(-W|/w[1234eo])")
diff --git a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250127.0.bb
similarity index 90%
rename from meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb
rename to meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250127.0.bb
index 4bfc2100e4..88e20c0577 100644
--- a/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb
+++ b/meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250127.0.bb
@@ -7,14 +7,13 @@  SECTION = "libs"
 LICENSE = "Apache-2.0"
 LIC_FILES_CHKSUM = "file://LICENSE;md5=df52c6edb7adc22e533b2bacc3bd3915"
 
-SRCREV = "4447c7562e3bc702ade25105912dce503f0c4010"
-BRANCH = "lts_2024_07_22"
+SRCREV = "9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f"
+BRANCH = "lts_2025_01_27"
 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-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch \
           "
 
 S = "${WORKDIR}/git"