Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 5 Jan 2025 11:51:36 GMT
From:      Daniel Engberg <diizzy@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: a7559a88b5ed - main - math/z3: Improve port
Message-ID:  <202501051151.505Bpa3K015873@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by diizzy:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a7559a88b5ed0dba019930bb07739e54c45fdb7c

commit a7559a88b5ed0dba019930bb07739e54c45fdb7c
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2025-01-05 11:48:41 +0000
Commit:     Daniel Engberg <diizzy@FreeBSD.org>
CommitDate: 2025-01-05 11:50:16 +0000

    math/z3: Improve port
    
    * Use upstream release archive
    * Change USES= compiler:c++11-lang to compiler:c++20-lang
    * Do some slight rearragement of port Makefile to more closely follow Porters Handbook
    * Respect CPUTYPE set by framework
    
    Note:
    Upstream is inconsistent about versioning but 4.13.4.0 is defined
    in project files.
    
    PR:             283858
    Reviewed by:    arrowd (maintainer)
---
 math/z3/Makefile                   | 20 ++++++++++----------
 math/z3/distinfo                   |  6 +++---
 math/z3/files/patch-CMakeLists.txt | 22 ++++++++++++++++++++++
 3 files changed, 35 insertions(+), 13 deletions(-)

diff --git a/math/z3/Makefile b/math/z3/Makefile
index ac42b2bf91aa..f4f27d32517b 100644
--- a/math/z3/Makefile
+++ b/math/z3/Makefile
@@ -1,7 +1,8 @@
 PORTNAME=	z3
-DISTVERSIONPREFIX=	z3-
-DISTVERSION=	4.13.4
+DISTVERSION=	4.13.4.0
 CATEGORIES=	math
+MASTER_SITES=	https://github.com/Z3Prover/z3/releases/download/${PORTNAME}-${DISTVERSION:R}/
+DISTNAME=	${PORTNAME}_solver-${DISTVERSION}
 
 MAINTAINER=	arrowd@FreeBSD.org
 COMMENT=	Z3 Theorem Prover
@@ -10,18 +11,17 @@ WWW=		https://github.com/Z3Prover/z3
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-USES=		cmake compiler:c++11-lang localbase:ldflags
-USE_GITHUB=	yes
-GH_ACCOUNT=	Z3Prover
+USES=		cmake compiler:c++20-lang localbase:ldflags
 
-OPTIONS_DEFINE=		GMP
+WRKSRC_SUBDIR=	core
 
-OPTIONS_SUB=		yes
+CMAKE_OFF=	Z3_ENABLE_EXAMPLE_TARGETS
+CMAKE_ARGS=	-DCMAKE_INSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig
+
+OPTIONS_DEFINE=	GMP
+OPTIONS_SUB=	yes
 
-GMP_DESC=		Use GMP library for AP arithmetic
 GMP_CMAKE_BOOL=		Z3_USE_LIB_GMP
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 
-CMAKE_ARGS=		-DCMAKE_INSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig
-
 .include <bsd.port.mk>
diff --git a/math/z3/distinfo b/math/z3/distinfo
index 98b235f2614f..519e40ed8032 100644
--- a/math/z3/distinfo
+++ b/math/z3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1736070226
-SHA256 (Z3Prover-z3-z3-4.13.4_GH0.tar.gz) = 4071977e66e9f3d239b7b098ceddfe62ffdf3c71e345e9524a4a5001d1f4adf3
-SIZE (Z3Prover-z3-z3-4.13.4_GH0.tar.gz) = 5766645
+TIMESTAMP = 1736078545
+SHA256 (z3_solver-4.13.4.0.tar.gz) = 66944689398d19f831f94524e95e99961d998afa27cfef1918a5a441029ea73f
+SIZE (z3_solver-4.13.4.0.tar.gz) = 4969872
diff --git a/math/z3/files/patch-CMakeLists.txt b/math/z3/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..ecd14ad7a61c
--- /dev/null
+++ b/math/z3/files/patch-CMakeLists.txt
@@ -0,0 +1,22 @@
+Let Framework control CPU-specific optimizations
+
+--- CMakeLists.txt.orig	2025-01-05 12:12:08 UTC
++++ CMakeLists.txt
+@@ -269,7 +269,7 @@ endif()
+ 
+ 
+ 
+-################################################################################
++#[[ ################################################################################
+ # FP math
+ ################################################################################
+ # FIXME: Support ARM "-mfpu=vfp -mfloat-abi=hard"
+@@ -286,7 +286,7 @@ if ((TARGET_ARCHITECTURE STREQUAL "x86_64") OR (TARGET
+     list(APPEND Z3_COMPONENT_CXX_FLAGS ${SSE_FLAGS})
+   endif()
+   unset(SSE_FLAGS)
+-endif()
++endif() ]]
+ 
+ ################################################################################
+ # Threading support



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202501051151.505Bpa3K015873>