summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp/0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch30
-rw-r--r--meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20250127.0.bb (renamed from meta-oe/recipes-devtools/abseil-cpp/abseil-cpp_20240722.0.bb)5
2 files changed, 2 insertions, 33 deletions
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 @@
1From 9cb5e5d15c142e5cc43a2c1db87c8e4e5b6d38a5 Mon Sep 17 00:00:00 2001
2From: Derek Mauro <dmauro@google.com>
3Date: Mon, 5 Aug 2024 07:35:05 -0700
4Subject: [PATCH] Don't match -Wnon-virtual-dtor in the "flags are needed to
5 suppress warnings in headers". It should fall through to the "don't impose
6 our warnings on others" case. Do this by matching on "-Wno-*" instead of
7 "-Wno*".
8
9Fixes #1737
10
11PiperOrigin-RevId: 659548798
12Change-Id: I49d7ba7ddcd7be30f946fca90ba9be467181e854
13Upstream-Status: Backport [https://github.com/abseil/abseil-cpp/commit/9cb5e5d15c142e5cc43a2c1db87c8e4e5b6d38a5]
14---
15 CMake/AbseilHelpers.cmake | 2 +-
16 1 file changed, 1 insertion(+), 1 deletion(-)
17
18diff --git a/CMake/AbseilHelpers.cmake b/CMake/AbseilHelpers.cmake
19index b177e590..3c4c92fe 100644
20--- a/CMake/AbseilHelpers.cmake
21+++ b/CMake/AbseilHelpers.cmake
22@@ -195,7 +195,7 @@ function(absl_cc_library)
23 # specified platform. Filter both of them out before the successor
24 # reaches the "^-m" filter.
25 set(skip_next_cflag ON)
26- elseif(${cflag} MATCHES "^(-Wno|/wd)")
27+ elseif(${cflag} MATCHES "^(-Wno-|/wd)")
28 # These flags are needed to suppress warnings that might fire in our headers.
29 set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
30 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
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"
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 = "4447c7562e3bc702ade25105912dce503f0c4010" 10SRCREV = "9ac7062b1860d895fb5a8cbf58c3e9ef8f674b5f"
11BRANCH = "lts_2024_07_22" 11BRANCH = "lts_2025_01_27"
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-Remove-maes-option-from-cross-compilation.patch \
15 file://0003-Remove-neon-option-from-cross-compilation.patch \ 15 file://0003-Remove-neon-option-from-cross-compilation.patch \
16 file://0004-abseil-ppc-fixes.patch \ 16 file://0004-abseil-ppc-fixes.patch \
17 file://0005-Don-t-match-Wnon-virtual-dtor-in-the-flags-are-neede.patch \
18 " 17 "
19 18
20S = "${WORKDIR}/git" 19S = "${WORKDIR}/git"