From nobody Wed Jan 04 22:12:04 2023 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 4NnP386btbz2pGJZ; Wed, 4 Jan 2023 22:12:04 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4NnP386946z3LkH; Wed, 4 Jan 2023 22:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672870324; 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=E6s751zIjPUNDrATS6XYpJJ2AAmvdD4dEP5qcREuMwg=; b=J0t5eEyNN2IlcfYA/Z0R1PkTgyynqbrPMNpigu4WF5Mj+d7NPjzbtOV9ivVoeKYBqmGPke u5xShhfAYSkmYiPv809+1N3vQHf4nibI/bpnbFgFfwFM/4/RFPMB+eYKVfn+WUYlKgBFXw q6VO9KE29DxjlqU0N+ZUMtoLfSeg3AypkrA5OwLuGjw2FeZhM9p0O/rnK5Iq+1i2YClq1S OcBtIVzzjvNfwlwxWlzApWtrUKS+n9TqmcNnIT8fDr5SIVV/y3YgVk9/d4LMQ+wsYrYKH8 SL29RIdefvR/J8zjPANOF4MuZyq1ghXu4fgQB/T0WblvH0BEujIKUn6HrKnjKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1672870324; 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=E6s751zIjPUNDrATS6XYpJJ2AAmvdD4dEP5qcREuMwg=; b=Ih9EpXe+wFZ12LGRbZ/dWHkJbg4Cj0myUEFuyr0GrpxsBdjmlZiSMLZD2pIrv1ECiY+jEe MXY6RzCuQoGqcyOwxSVUA8mH+oVC7C2lvMxxxKY7h+quCANsssb16Mbw7V/sNHDOj2sHSJ 4YjZUIEtbcpemOEWFqffhVV25e91vWdm8DSoCoHUjD+BC5WZ3df03OJ2w99Mgddo9jnJTJ 5u8M6GpQIuhRZ88eTOW5765GVCoj61F4ObxoVuv98e1G0ZUa1hFVe8QbFaC27VLa4TPXKt sb9tvfYC8dd4LqTx0CWF0Mx43y7MPJVH2wI3XVoiOFHjt3pz8Qmvr6siayXV3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1672870324; a=rsa-sha256; cv=none; b=AL+ykpaQXwy0jiDFRtVf0lwNQ2fUs8AvNil78hQqBuS85qi4dSqbpkAHdAyI4D/X/bAMza 2EB0ylJ2dXQxKBwJd4SBq1Zip/srGZxc/ow2zcRQp6OjIlDeWGL4uN59QYOLZbHbTu81gE ipTWIR6a3UpTzZ39Ow2BL0rbMpLD3EVyuuUG+/xPfo7Uy4RafzjQJI9mFRK1fUcN3GvlhY tVNpBK37zdDnu6zRigqih5Qjt+Sx1PNTKwOGxqf4Rsu/PHR7DtLKncOiYVcvKVoyWHbybi iW5NvL4IJos0J9HGNyPNYAmQ17VhAau+QEeMjB25RQplGI1n17llsjz4GAvA2w== 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 4NnP385DfZzRpy; Wed, 4 Jan 2023 22:12:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 304MC4gB044384; Wed, 4 Jan 2023 22:12:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 304MC4PC044383; Wed, 4 Jan 2023 22:12:04 GMT (envelope-from git) Date: Wed, 4 Jan 2023 22:12:04 GMT Message-Id: <202301042212.304MC4PC044383@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Yuri Victorovich Subject: git: ce9e60d6a133 - main - cad/yosys: Update 0.24 -> 0.25 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuri X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce9e60d6a133331ea8cbb8de7f48542ee8b85702 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=ce9e60d6a133331ea8cbb8de7f48542ee8b85702 commit ce9e60d6a133331ea8cbb8de7f48542ee8b85702 Author: Yuri Victorovich AuthorDate: 2023-01-04 15:55:01 +0000 Commit: Yuri Victorovich CommitDate: 2023-01-04 22:12:01 +0000 cad/yosys: Update 0.24 -> 0.25 Reported by: portscout --- cad/yosys/Makefile | 15 ++++++++++++++- cad/yosys/distinfo | 6 +++--- cad/yosys/files/patch-backends_smt2_smtio.py | 14 ++++++++++++++ 3 files changed, 31 insertions(+), 4 deletions(-) diff --git a/cad/yosys/Makefile b/cad/yosys/Makefile index ba0524ba92af..93b24e0cc50b 100644 --- a/cad/yosys/Makefile +++ b/cad/yosys/Makefile @@ -1,6 +1,6 @@ PORTNAME= yosys DISTVERSIONPREFIX= yosys- -DISTVERSION= 0.24 +DISTVERSION= 0.25 CATEGORIES= cad MAINTAINER= yuri@FreeBSD.org @@ -34,6 +34,19 @@ MAKE_ENV= MAKE=${GMAKE} TEST_TARGET= test # some tests fail, see https://github.com/YosysHQ/yosys/issues/3505 +OPTIONS_GROUP= SOLVERS +OPTIONS_GROUP_SOLVERS= CVC5 YICES Z3 +OPTIONS_DEFAULT= YICES # same as the default in C++ code + +SOLVERS_DESC= Install SAT solvers +CVC5_DESC= CVC SAT Solver +YICES_DESC= Yices SAT Solver +Z3_DESC= Z3 SAT Solver + +CVC5_RUN_DEPENDS= cvc5:math/cvc5 +YICES_RUN_DEPENDS= yices_smt2:math/yices +Z3_RUN_DEPENDS= z3:math/z3 + post-patch: ${REINPLACE_CMD} -e '/^CXX =/d; s/^LD = .*/LD = $$(CXX)/' \ -e '/^CONFIG/s/clang/${CHOSEN_COMPILER_TYPE}/' \ diff --git a/cad/yosys/distinfo b/cad/yosys/distinfo index f605e81864df..8d1f7daaed54 100644 --- a/cad/yosys/distinfo +++ b/cad/yosys/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1670571827 -SHA256 (YosysHQ-yosys-yosys-0.24_GH0.tar.gz) = 6a00b60e2d6bc8df0db1e66aa27af42a0694121cfcd6a3cf6f39c9329ed91263 -SIZE (YosysHQ-yosys-yosys-0.24_GH0.tar.gz) = 2659037 +TIMESTAMP = 1672860519 +SHA256 (YosysHQ-yosys-yosys-0.25_GH0.tar.gz) = 673e87eecb68fd5e889ac94b93dc9ae070f1a27d94dacbd738212cf09f39578c +SIZE (YosysHQ-yosys-yosys-0.25_GH0.tar.gz) = 2465790 diff --git a/cad/yosys/files/patch-backends_smt2_smtio.py b/cad/yosys/files/patch-backends_smt2_smtio.py new file mode 100644 index 000000000000..a39fc9c4fc91 --- /dev/null +++ b/cad/yosys/files/patch-backends_smt2_smtio.py @@ -0,0 +1,14 @@ +--- backends/smt2/smtio.py.orig 2023-01-04 19:51:15 UTC ++++ backends/smt2/smtio.py +@@ -182,9 +182,9 @@ class SmtIo: + self.noincr = True + + if self.noincr: +- self.popen_vargs = ['yices-smt2'] + self.solver_opts ++ self.popen_vargs = ['yices_smt2'] + self.solver_opts + else: +- self.popen_vargs = ['yices-smt2', '--incremental'] + self.solver_opts ++ self.popen_vargs = ['yices_smt2', '--incremental'] + self.solver_opts + if self.timeout != 0: + self.popen_vargs.append('-t') + self.popen_vargs.append('%d' % self.timeout);