xsimd fix for i686 build failure

adapted from: https://github.com/xtensor-stack/xsimd/pull/991
upstream report: https://bugzilla.mozilla.org/show_bug.cgi?id=1868933

diff --git a/firefox.spec b/firefox.spec
index 0e01f31222778b339d73aca201fb6886cb7fc717..ded00ac8517b1d97b0fc9a92d28b32cbc1b94029 100644 (file)
--- a/firefox.spec
+++ b/firefox.spec
@@ -269,6 +269,7 @@ Source200:  https://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i6
 # Source200-md5:       1ac78a3012bae2f9d6bd1d0b13a3c4ed
 Source201:     https://releases.mozilla.org/pub/firefox/releases/%{version}/linux-i686/xpi/zh-TW.xpi
 # Source201-md5:       924385f8d9e548adaf817a6549dd1643
+Patch0:                xsimd-unsupported-arch.patch
 Patch4:                %{name}-prefs.patch
 Patch5:                %{name}-pld-bookmarks.patch
 Patch6:                %{name}-no-subshell.patch
@@ -2191,6 +2192,7 @@ unpack() {
 %define __unzip unpack
 %setup -q %(seq -f '-a %g' 100 201 | xargs)
 
+%patch0 -p1 -d third_party/xsimd
 %patch4 -p1
 %patch5 -p1
 %patch6 -p2

diff --git a/xsimd-unsupported-arch.patch b/xsimd-unsupported-arch.patch
new file mode 100644 (file)
index 0000000..5cdf89c
--- /dev/null
+++ b/xsimd-unsupported-arch.patch
@@ -0,0 +1,26 @@
+From c4387612100f5740d6591c8c77f969cd05409dc8 Mon Sep 17 00:00:00 2001
+From: serge-sans-paille <serge.guelton@telecom-bretagne.eu>
+Date: Mon, 11 Dec 2023 10:40:19 +0100
+Subject: [PATCH] Fix regression on XSIMD_NO_SUPPORTED_ARCHITECTURE introduced
+ in e92cd8667231f25d88d233ceca04a64b063e33f3
+
+Also add a test to make sure we don't regress in the future.
+
+Fix #990
+---
+ .github/workflows/cross.yml           | 7 ++++---
+ include/xsimd/config/xsimd_config.hpp | 1 +
+ 2 files changed, 5 insertions(+), 3 deletions(-)
+
+diff --git a/include/xsimd/config/xsimd_config.hpp b/include/xsimd/config/xsimd_config.hpp
+index 31c4acb9e..ac416c70f 100644
+--- a/include/xsimd/config/xsimd_config.hpp
++++ b/include/xsimd/config/xsimd_config.hpp
+@@ -434,6 +434,7 @@
+ #endif
+ 
+ #if !XSIMD_WITH_SSE2 && !XSIMD_WITH_SSE3 && !XSIMD_WITH_SSSE3 && !XSIMD_WITH_SSE4_1 && !XSIMD_WITH_SSE4_2 && !XSIMD_WITH_AVX && !XSIMD_WITH_AVX2 && !XSIMD_WITH_FMA3_SSE && !XSIMD_WITH_FMA4 && !XSIMD_WITH_FMA3_AVX && !XSIMD_WITH_FMA3_AVX2 && !XSIMD_WITH_AVX512F && !XSIMD_WITH_AVX512CD && !XSIMD_WITH_AVX512DQ && !XSIMD_WITH_AVX512BW && !XSIMD_WITH_NEON && !XSIMD_WITH_NEON64 && !XSIMD_WITH_SVE && !XSIMD_WITH_WASM
++#define XSIMD_NO_SUPPORTED_ARCHITECTURE
+ #endif
+ 
+ #endif