From c415d8fa5446c5ace23f53b075c03b8d23e607fc27afece128296f99309360f7 Mon Sep 17 00:00:00 2001 From: Fabian Vogt Date: Tue, 12 Jul 2022 08:26:10 +0000 Subject: [PATCH] Accepting request 988522 from home:dziobian - Add Fix-maes-msse41-leaking-into-pkgconfig.patch * Do not make programs compiled with abseil require new-ish CPUs. OBS-URL: https://build.opensuse.org/request/show/988522 OBS-URL: https://build.opensuse.org/package/show/devel:microos/abseil-cpp?expand=0&rev=8 --- Fix-maes-msse41-leaking-into-pkgconfig.patch | 13 +++++++++++++ abseil-cpp.changes | 6 ++++++ abseil-cpp.spec | 2 ++ 3 files changed, 21 insertions(+) create mode 100644 Fix-maes-msse41-leaking-into-pkgconfig.patch diff --git a/Fix-maes-msse41-leaking-into-pkgconfig.patch b/Fix-maes-msse41-leaking-into-pkgconfig.patch new file mode 100644 index 0000000..38b94eb --- /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 699c075..0957d7b 100644 --- a/abseil-cpp.changes +++ b/abseil-cpp.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +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 diff --git a/abseil-cpp.spec b/abseil-cpp.spec index 241cd68..bd32314 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++