Index | Thread | Search

From:
Stuart Henderson <stu@spacehopper.org>
Subject:
Re: net/rspamd: Fix build with textproc/simdutf installed
To:
Volker Schlecht <openbsd-ports@schlecht.dev>
Cc:
ports <ports@openbsd.org>, Jeremie Courreges-Anglas <jca@wxcvbn.org>
Date:
Tue, 21 Oct 2025 21:55:37 +0100

Download raw body.

Thread
no need to bump for this (either theee's no change, or the build fails)

ok


On 2025/10/21 21:29, Volker Schlecht wrote:
> On 10/21/25 9:29 AM, Jeremie Courreges-Anglas wrote:
> 
> > - mail/rspamd fails to build when simdutf is installed, looks like an
> >    include ordering conflict with its internal copy.  Better fix that
> >    before textproc/simdutf gets used as a dep for other ports.
> The attached patch fixes that and looks like something upstream might
> accept, too.
> 
> ok?
> 

> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/mail/rspamd/Makefile,v
> retrieving revision 1.150
> diff -u -p -r1.150 Makefile
> --- Makefile	17 Oct 2025 11:31:01 -0000	1.150
> +++ Makefile	21 Oct 2025 19:28:32 -0000
> @@ -3,7 +3,7 @@ COMMENT=	event-driven spam filtering sys
>  GH_ACCOUNT=	vstakhov
>  GH_PROJECT=	rspamd
>  GH_TAGNAME=	3.13.2
> -REVISION=	0
> +REVISION=	1
>  
>  CATEGORIES=	mail
>  
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: patches/patch-CMakeLists_txt
> diff -N patches/patch-CMakeLists_txt
> --- /dev/null	1 Jan 1970 00:00:00 -0000
> +++ patches/patch-CMakeLists_txt	21 Oct 2025 19:28:32 -0000
> @@ -0,0 +1,13 @@
> +Avoid conflict with includes from simdutf installed system-wide
> +
> +Index: CMakeLists.txt
> +--- CMakeLists.txt.orig
> ++++ CMakeLists.txt
> +@@ -138,6 +138,7 @@ include_directories(
> +         "${CMAKE_SOURCE_DIR}/contrib/lua-lpeg"
> +         "${CMAKE_SOURCE_DIR}/contrib/frozen/include"
> +         "${CMAKE_SOURCE_DIR}/contrib/fu2/include"
> ++        "${CMAKE_SOURCE_DIR}/contrib/simdutf/include"
> +         "${CMAKE_BINARY_DIR}/src" # Stored in the binary dir
> +         "${CMAKE_BINARY_DIR}/src/libcryptobox"
> + )