[packages/vectorscan] - rel 3 - disable AVX on ix86 - remove opt flags overrides from cmake

[baggins]

commit 6e0f985f0732e34216a39f6ca884fe4e9888ff10
Author: Jan Rękorajski <baggins at pld-linux.org>
Date:   Sat May 9 15:48:24 2026 +0200

    - rel 3
    - disable AVX on ix86
    - remove opt flags overrides from cmake

 no-avx.patch    | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 optflags.patch  | 22 ++++++++++++++++++++
 vectorscan.spec | 13 +++++++++++-
 3 files changed, 98 insertions(+), 1 deletion(-)
---
diff --git a/vectorscan.spec b/vectorscan.spec
index 242470b..fc05df0 100644
--- a/vectorscan.spec
+++ b/vectorscan.spec
@@ -2,13 +2,15 @@ Summary:	High-performance regular expression matching library
 Summary(pl.UTF-8):	Biblioteka szybkiego dopasowywania wyrażeń regularnych
 Name:		vectorscan
 Version:	5.4.12
-Release:	2
+Release:	3
 License:	BSD
 Group:		Libraries
 Source0:	https://github.com/VectorCamp/vectorscan/archive/vectorscan/%{version}/%{name}-%{version}.tar.gz
 # Source0-md5:	384eab5b23831993df96e5fa55f9951e
 Patch0:		%{name}-pkgconfig.patch
 Patch1:		size_t-type.patch
+Patch2:		no-avx.patch
+Patch3:		optflags.patch
 URL:		https://github.com/VectorCamp/vectorscan
 BuildRequires:	boost-devel
 BuildRequires:	cmake >= 3.0
@@ -59,6 +61,10 @@ Statyczna biblioteka Vectorscan.
 %setup -q -n %{name}-%{name}-%{version}
 %patch -P0 -p1
 %patch -P1 -p1
+%ifarch %{ix86}
+%patch -P2 -p1
+%endif
+%patch -P3 -p1
 
 %build
 install -d build
@@ -71,6 +77,11 @@ cd build
 	-DBUILD_DOC=OFF \
 	-DBUILD_EXAMPLES=OFF \
 	-DBUILD_UNIT=OFF \
+%ifarch %{ix86}
+	-DBUILD_AVX512VBMI:BOOL=OFF \
+	-DBUILD_AVX512:BOOL=OFF \
+	-DBUILD_AVX2:BOOL=OFF \
+%endif
 	..
 
 %{__make}
diff --git a/no-avx.patch b/no-avx.patch
new file mode 100644
index 0000000..46e5019
--- /dev/null
+++ b/no-avx.patch
@@ -0,0 +1,64 @@
+--- vectorscan-vectorscan-5.4.12/cmake/cflags-x86.cmake~	2025-07-22 17:09:14.000000000 +0200
++++ vectorscan-vectorscan-5.4.12/cmake/cflags-x86.cmake	2026-05-09 15:04:36.206681465 +0200
+@@ -31,12 +31,8 @@
+         set(X86_ARCH "x86-64-v2")
+     endif()
+ else()
+-    set(BUILD_AVX512VBMI ON)
+-    set(BUILD_AVX512 ON)
+-    set(BUILD_AVX2 ON)
+     set(ARCH_C_FLAGS "-msse4.2")
+     set(ARCH_CXX_FLAGS "-msse4.2")
+-    set(X86_ARCH "x86-64-v2")
+ endif()
+ 
+ set(CMAKE_REQUIRED_FLAGS "${ARCH_C_FLAGS}")
+--- vectorscan-vectorscan-5.4.12/src/util/arch/x86/cpuid_inline.h~	2025-07-22 17:09:14.000000000 +0200
++++ vectorscan-vectorscan-5.4.12/src/util/arch/x86/cpuid_inline.h	2026-05-09 15:38:28.820015023 +0200
+@@ -98,6 +98,7 @@
+ 
+ static inline
+ int check_avx2(void) {
++#if defined(BUILD_AVX2)
+     unsigned int eax, ebx, ecx, edx;
+ 
+     cpuid(1, 0, &eax, &ebx, &ecx, &edx);
+@@ -124,12 +125,13 @@
+         DEBUG_PRINTF("AVX2 enabled\n");
+         return 1;
+     }
+-
++#endif
+     return 0;
+ }
+ 
+ static inline
+ int check_avx512(void) {
++#if defined(BUILD_AVX512)
+     /*
+      * For our purposes, having avx512 really means "can we use AVX512BW?"
+      */
+@@ -163,12 +165,13 @@
+         DEBUG_PRINTF("AVX512BW instructions enabled\n");
+         return 1;
+     }
+-
++#endif
+     return 0;
+ }
+ 
+ static inline
+ int check_avx512vbmi(void) {
++#if defined(BUILD_AVX512VBMI)
+     unsigned int eax, ebx, ecx, edx;
+ 
+     cpuid(1, 0, &eax, &ebx, &ecx, &edx);
+@@ -204,7 +207,7 @@
+         DEBUG_PRINTF("AVX512VBMI instructions enabled\n");
+         return 1;
+     }
+-
++#endif
+     return 0;
+ }
+ 
diff --git a/optflags.patch b/optflags.patch
new file mode 100644
index 0000000..889a630
--- /dev/null
+++ b/optflags.patch
@@ -0,0 +1,22 @@
+--- vectorscan-vectorscan-5.4.12/CMakeLists.txt~	2025-07-22 17:09:14.000000000 +0200
++++ vectorscan-vectorscan-5.4.12/CMakeLists.txt	2026-05-09 15:09:45.506681518 +0200
+@@ -179,19 +179,6 @@
+ message(STATUS "ARCH_C_FLAGS   : ${ARCH_C_FLAGS}")
+ message(STATUS "ARCH_CXX_FLAGS : ${ARCH_CXX_FLAGS}")
+ 
+-if(RELEASE_BUILD)
+-    if (NOT CMAKE_BUILD_TYPE MATCHES MINSIZEREL)
+-        set(OPT_C_FLAG "-O3")
+-        set(OPT_CXX_FLAG "-O3")
+-    else ()
+-        set(OPT_C_FLAG "-Os")
+-        set(OPT_CXX_FLAG "-Os")
+-    endif ()
+-else()
+-    set(OPT_C_FLAG "-O0")
+-    set(OPT_CXX_FLAG "-O0")
+-endif(RELEASE_BUILD)
+-
+ include (${CMAKE_MODULE_PATH}/cflags-generic.cmake)
+ 
+ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/vectorscan.git/commitdiff/6e0f985f0732e34216a39f6ca884fe4e9888ff10