Attachment 255684 Details for Bug 283183 – Patch for geos

[patch] Patch for geos

geos-fixup.patch (text/plain), 1.27 KB, created by Daniel Engberg on 2024-12-07 16:24:10 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Daniel Engberg

Created: 2024-12-07 16:24:10 UTC

Size: 1.27 KB

patch

obsolete

>diff --git a/graphics/geos/Makefile b/graphics/geos/Makefile
>index 62e9ec883bed..e4feb6f3490f 100644
>--- a/graphics/geos/Makefile
>+++ b/graphics/geos/Makefile
>@@ -12,9 +12,9 @@ WWW=		https://libgeos.org/ \
> LICENSE=	LGPL21
> LICENSE_FILE=	${WRKSRC}/COPYING
> 
>-USES=		cmake compiler:c++14-lang pathfix tar:bzip2
>+USES=		cmake:testing compiler:c++14-lang pathfix tar:bzip2
> 
>-CMAKE_OFF=	BUILD_BENCHMARKS DISABLE_GEOS_INLINE
>+CMAKE_OFF=	BUILD_BENCHMARKS BUILD_TESTING DISABLE_GEOS_INLINE
> CMAKE_ON=	BUILD_SHARED_LIBS
> USE_LDCONFIG=	yes
> 
>diff --git a/graphics/geos/files/patch-CMakeLists.txt b/graphics/geos/files/patch-CMakeLists.txt
>new file mode 100644
>index 000000000000..ead3fac57d52
>--- /dev/null
>+++ b/graphics/geos/files/patch-CMakeLists.txt
>@@ -0,0 +1,11 @@
>+--- CMakeLists.txt.orig	2024-12-07 16:18:30 UTC
>++++ CMakeLists.txt
>+@@ -215,7 +215,7 @@ target_compile_options(geos_cxx_flags INTERFACE
>+ #-----------------------------------------------------------------------------
>+ 
>+ target_compile_options(geos_cxx_flags INTERFACE
>+-	"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-ffp-contract=off>"
>++	"$<$<OR:$<CXX_COMPILER_ID:Clang>,$<CXX_COMPILER_ID:AppleClang>>:-ffp-model=strict>"
>+ 	"$<$<CXX_COMPILER_ID:GNU>:-ffp-contract=off>"
>+ 	"$<$<BOOL:${MSVC}>:/fp:precise>"
>+ 	)

Actions: View | Diff

Attachments on bug 283183: 255684