From nobody Sun Jan 05 11:51:36 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YQwdN6PCyz5j4Zp; Sun, 05 Jan 2025 11:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YQwdN5gpdz4cyg; Sun, 5 Jan 2025 11:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736077896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUEueJVKycTes22NVX1do8o8791cZ7nNHeZcy8543jY=; b=AUwVi/z2055afwEKpxeci1K93kNtAtGkraxChcdIy8Yy4hHFoBe8P7VeUrBslYAp/waHkl 9QznIXmntvmnz3t2XEVrlwWMIhHdWxxt53OOuqNd2WJWdof99y5cEpTN7u9zeuubqUNYlT BDP53I6nZRG8zNQh73pUITDvjnBVltBvjlklgi/hzQTIKyyMluo0KNAhgJnurmuoFookw9 ircaHWtpjUNnhWcO8lMVCuxSKdGFXZhbpsT3GmPKbfuPrWcuyJd5pJ6l1UNTqCsdQrh0Iq UQTa2xe9YaKRiouAFQh/Hn/RkciiIvSkvlqfTORr1g9EgI7fddvXYY/H2d5OiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1736077896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AUEueJVKycTes22NVX1do8o8791cZ7nNHeZcy8543jY=; b=V/+rEjLeflGD031XcVpbGADOUIRSkhmhgsBqZ6N91H3aw4R78PBXj8OrJUtFaK7nQaWRs6 mMUJZ06Xbz3zrPZqqc4ffUkqMlmJfYqQ/+0SIsfy/HLAF4ahP9HeJ8JsBV3UMpbqdUk5LK mctyok1w9ASSqk+b3V1ylkx8owt6WZJ9BfIjtMJ0Pb3xzrPB51fAm6bd+pbBdjzfQAZFB+ tWuR3fvUfQ5bzr3v0XqcM803UFrpl1kPAUaYMiEWAa3wWoI0Vo8fibEE9uxRt3OX8ekh89 pVDT4BsWn9GcLtOFDoer9E1zjbydORjIqLTHuXq+cwdw613H0hhDsQy7ezsz7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1736077896; a=rsa-sha256; cv=none; b=J+uwFAq9t3yE1GVuxkOoKATcpZm9YRuY7YfhVXp5Z8P8nRp/hNhwY66JTvTD0d4wboK5Jx 2A5HM0y21eeKPa1vvhVbvcuW1ckvdGJM3Vf8AetyP0vIIQhJ4q5QusmQyv1pUIHVTnygST 2YQLBlQ+sz6W3xihvwHfbiPMDQWt4hTHkASkz2ko+zi0tUr2vTTBcuSycs6UjCcFxKLfhq H9xfvLE3adNF/aoby2EVoxnSjbA9anrwSEASWvKlw7d1NnqENOHrzfYL/p3yUTxIJ1b5Eh ThyrluFsCjmJj5tkHr2XzOQAPYl0qR5FrrSA5Wl0RpY9U5tPLqPBXWup4d+bCg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YQwdN54Wjzd8V; Sun, 05 Jan 2025 11:51:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 505Bpa2v015876; Sun, 5 Jan 2025 11:51:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 505Bpa3K015873; Sun, 5 Jan 2025 11:51:36 GMT (envelope-from git) Date: Sun, 5 Jan 2025 11:51:36 GMT Message-Id: <202501051151.505Bpa3K015873@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Daniel Engberg Subject: git: a7559a88b5ed - main - math/z3: Improve port List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: diizzy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a7559a88b5ed0dba019930bb07739e54c45fdb7c Auto-Submitted: auto-generated The branch main has been updated by diizzy: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7559a88b5ed0dba019930bb07739e54c45fdb7c commit a7559a88b5ed0dba019930bb07739e54c45fdb7c Author: Daniel Engberg AuthorDate: 2025-01-05 11:48:41 +0000 Commit: Daniel Engberg 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 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