From 92bf1f6545d8ccf7b9a08e825e975b3c7ee9f8d9 Mon Sep 17 00:00:00 2001
From: favogt <>
Date: Jul 13 2022 13:04:26 +0000
Subject: Update abseil-cpp to version 20220623.0 / rev 25 via SR 988573
https://build.opensuse.org/request/show/988573
by user favogt + dimstar_suse
---
diff --git a/.files b/.files
index 3313578..7c3c21e 100644
Binary files a/.files and b/.files differ
diff --git a/.rev b/.rev
index a2cbbe8..296792c 100644
--- a/.rev
+++ b/.rev
@@ -212,4 +212,12 @@
986572
+
+ d4472c307a0301c70b7739d64abffc82
+ 20220623.0
+
+ dimstar_suse
+
+ 988573
+
diff --git a/Fix-maes-msse41-leaking-into-pkgconfig.patch b/Fix-maes-msse41-leaking-into-pkgconfig.patch
new file mode 100644
index 0000000..87545bf
--- /dev/null
+++ b/Fix-maes-msse41-leaking-into-pkgconfig.patch
@@ -0,0 +1,13 @@
+Fix for programs depending on abseil getting unexpectedly compiled with -maes -msse4.1 (or equivalent for other platforms), raising the CPU requirement.
+
+--- a/CMake/AbseilHelpers.cmake 2022-06-23 20:22:47.000000000 +0200
++++ b/CMake/AbseilHelpers.cmake 2022-07-11 16:51:58.364596579 +0200
+@@ -166,6 +166,8 @@
+ set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
+ elseif(${cflag} MATCHES "^(-W|/w[1234eo])")
+ # Don't impose our warnings on others.
++ elseif(${cflag} MATCHES "^-m")
++ # Don't impose CPU instruction requirements on others, as the code performs feature detection on runtime.
+ else()
+ set(PC_CFLAGS "${PC_CFLAGS} ${cflag}")
+ endif()
diff --git a/abseil-cpp.changes b/abseil-cpp.changes
index 9b96b92..9bd658c 100644
--- a/abseil-cpp.changes
+++ b/abseil-cpp.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Mon Jul 11 14:56:15 UTC 2022 - Bruno Pitrus
+
+- Add Fix-maes-msse41-leaking-into-pkgconfig.patch
+ * Do not make programs compiled with abseil require new-ish CPUs.
+
+-------------------------------------------------------------------
Sun Jul 3 21:25:15 UTC 2022 - Matthias Eliasson
- Update to version 20220623.0
diff --git a/abseil-cpp.spec b/abseil-cpp.spec
index 11547ed..be791b8 100644
--- a/abseil-cpp.spec
+++ b/abseil-cpp.spec
@@ -34,6 +34,8 @@ Patch0: options-old.patch
%else
Patch0: options-cxx17.patch
%endif
+# PATCH-FIX-UPSTREAM Fix-maes-msse41-leaking-into-pkgconfig.patch
+Patch1: Fix-maes-msse41-leaking-into-pkgconfig.patch
%description
Abseil is a collection of C++11 libraries which augment the C++