millerson.name/gentoo
2
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2025-12-08 00:05:33 +03:00
Code Issues Packages Projects Releases Wiki Activity

dev-libs/vectorscan: fix build failure on x86

Browse Source 
```
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@gentoo.org>
This commit is contained in:
Sam James 2025-11-28 02:59:09 +00:00
parent 505246215d
commit 75551ca336
No known key found for this signature in database
GPG Key ID: 738409F520DF9190
2 changed files with 31 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
dev-libs/vectorscan/files/vectorscan-5.4.12-build.patch Normal file
View File

@ -0,0 +1,27 @@
https://github.com/VectorCamp/vectorscan/commit/f472bfee05c88e3e46c149df1028557f47388b0e
From f472bfee05c88e3e46c149df1028557f47388b0e Mon Sep 17 00:00:00 2001
From: wnwu <madtrapper@users.noreply.github.com>
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 <wnwu@fortinet.com>
---
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));
}
}

4
dev-libs/vectorscan/vectorscan-5.4.12.ebuild
View File

@ -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)