commit: 75551ca3361cf507a0701ea783b456fbd6da1251
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 28 02:59:09 2025 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Nov 28 02:59:09 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75551ca3
dev-libs/vectorscan: fix build failure on x86
```
FAILED: [code=1]
CMakeFiles/hs_compile_shared.dir/src/fdr/fdr_engine_description.cpp.o
/usr/bin/i686-pc-linux-gnu-g++ -DNDEBUG
-I/var/tmp/portage/dev-libs/vectorscan-5.4.12/work/vectorscan-vectorscan-5.4.12_build
-I/var/tmp/portage/dev-libs/vectorscan-5.4.12/work/vectorsca
n-vectorscan-5.4.12
-I/var/tmp/portage/dev-libs/vectorscan-5.4.12/work/vectorscan-vectorscan-5.4.12/src
-isystem
/var/tmp/portage/dev-libs/vectorscan-5.4.12/work/vectorscan-vectorscan-5.
4.12/include -O2 -march=pentium4 -mfpmath=sse -pipe -msse4.2 -std=c++17
-Wall -Wextra -fno-new-ttp-matching -DNDEBUG -Wno-maybe-uninitialized
-Wno-uninitialized -fvisibility=hidden -
Wno-unused-but-set-variable -Wno-ignored-attributes -Wno-nonnull
-Wno-stringop-overflow -Wno-stringop-overread -fPIC -MD -MT
CMakeFiles/hs_compile_shared.dir/src/fdr/fdr_engine_descript
ion.cpp.o -MF
CMakeFiles/hs_compile_shared.dir/src/fdr/fdr_engine_description.cpp.o.d -o
CMakeFiles/hs_compile_shared.dir/src/fdr/fdr_engine_description.cpp.o -c
/var/tmp/portage/dev-lib
s/vectorscan-5.4.12/work/vectorscan-vectorscan-5.4.12/src/fdr/fdr_engine_description.cpp
/var/tmp/portage/dev-libs/vectorscan-5.4.12/work/vectorscan-vectorscan-5.4.12/src/fdr/fdr_engine_description.cpp:
In function ‘u32 ue2::findDesiredStride(size_t, size_t, size_t)’:
/var/tmp/portage/dev-libs/vectorscan-5.4.12/work/vectorscan-vectorscan-5.4.12/src/fdr/fdr_engine_description.cpp:74:37:
error: no matching function for call to ‘min(size_t, long unsigned
int)’
74 | desiredStride = std::min(min_len - 1, 2UL);
| ~~~~~~~~^~~~~~~~~~~~~~~~~~
```
Bug: https://bugs.gentoo.org/962120
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../vectorscan/files/vectorscan-5.4.12-build.patch | 27 ++++++++++++++++++++++
dev-libs/vectorscan/vectorscan-5.4.12.ebuild | 4 ++++
2 files changed, 31 insertions(+)
diff --git a/dev-libs/vectorscan/files/vectorscan-5.4.12-build.patch
b/dev-libs/vectorscan/files/vectorscan-5.4.12-build.patch
new file mode 100644
index 000000000000..b552390a73c0
--- /dev/null
+++ b/dev-libs/vectorscan/files/vectorscan-5.4.12-build.patch
@@ -0,0 +1,27 @@
+https://github.com/VectorCamp/vectorscan/commit/f472bfee05c88e3e46c149df1028557f47388b0e
+
+From f472bfee05c88e3e46c149df1028557f47388b0e Mon Sep 17 00:00:00 2001
+From: wnwu <[email protected]>
+Date: Fri, 10 Oct 2025 14:49:45 -0700
+Subject: [PATCH] fix mingw compile error by resolving std::min type mismatch
+ (#346)
+
+Co-authored-by: Weining Wu <[email protected]>
+---
+ src/fdr/fdr_engine_description.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/fdr/fdr_engine_description.cpp
b/src/fdr/fdr_engine_description.cpp
+index 6de09f92b..7efe5ceff 100644
+--- a/src/fdr/fdr_engine_description.cpp
++++ b/src/fdr/fdr_engine_description.cpp
+@@ -71,7 +71,7 @@ u32 findDesiredStride(size_t num_lits, size_t min_len,
size_t min_len_count) {
+ } else if (num_lits < 5000) {
+ // for larger but not huge sizes, go to stride 2 only if we have
at
+ // least minlen 3
+- desiredStride = std::min(min_len - 1, 2UL);
++ desiredStride = std::min(min_len - 1,
static_cast<std::size_t>(2UL));
+ }
+ }
+
+
diff --git a/dev-libs/vectorscan/vectorscan-5.4.12.ebuild
b/dev-libs/vectorscan/vectorscan-5.4.12.ebuild
index 76424bff449d..a4ed337e2d2c 100644
--- a/dev-libs/vectorscan/vectorscan-5.4.12.ebuild
+++ b/dev-libs/vectorscan/vectorscan-5.4.12.ebuild
@@ -39,6 +39,10 @@ REQUIRED_USE="
amd64? ( cpu_flags_x86_sse4_2 )
"
+PATCHES=(
+ "${FILESDIR}"/${PN}-5.4.12-build.patch
+)
+
src_prepare() {
local sedargs=(
# Respect user -m flags (march/mtune)
