From nobody Thu Jan 11 09:12:53 2024 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 4T9f8P3mBWz56xxb; Thu, 11 Jan 2024 09:12:53 +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 4T9f8P2t8wz4fF8; Thu, 11 Jan 2024 09:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704964373; 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=3TkCngNzKsfYky9YUFYFarEZ9oYlPZqiS6QRGs4Gr+E=; b=gHEgZ3Atoba5ngAWz7ylG4aibF7DuR6iqAPiI4DLznLKyMdh3BbA1lvFkOdeaeWg7CElZs /N1zMa7pVn21tjomgy3azsvqEELLVF8eSoC6A6d3aqUsHe5S7/gOuiNyiHF2WI1EOEucKg ylyKrh/9PxbQR2HdTA4dHs6hy10RkXHb2i1tcNIyhs9SWwfDtS0uStU5JZXvKn3oH3jMKO /fiXqm7bB0heQABenMJnJjmF7EswxLlcDQFK72JWuB5TSasXdwWQkmywwtgF3kC6sYOhMh wA3lG+PQ4hykb0ZGIhNM6fz2aXUiKNaYgYPgUq3WeseLT4AHNZ6RyMx+TxXThw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704964373; 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=3TkCngNzKsfYky9YUFYFarEZ9oYlPZqiS6QRGs4Gr+E=; b=P6kzKcQqnPbPBpXuiIt21FYCCTGDf/GwCRnwKKX1KMMcKOBhagy5xtmP1s4Wl/Qh4U0xVi rJUE/3AOUEd5A/xeDsGhnP2Y4vRI7UHjIkdZ3JOqRQXeDvpFtLZ4LCHcsY2VacRydd8yYN qT8B795v1eTqUiCbc0CjL3SMq2GdjauAnzPbmCIejrVQmW+lavqqeJsNimUnDFYocyxeuL FEGzsjfS/3Hyra6A1dBoVxteIskT66hkxSYBHe0CQSo5rvAdwaHYDzVjqXNthj6EN9EQIH XKls5V/dF1Uq2+hL+HdWZNblZm2CldJGTc/uYXoDa/klDnjEZUlvU2xKCQpUPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704964373; a=rsa-sha256; cv=none; b=DYMVdEpZ2iLOVNOBdFAMjGikzuY77BTyuKRBv9OEQ/ifJdfQ0LJXZ+VhDBdKhFJ9Hvkg2C NWsPVLMbcUU+67vWvTaILIZPxLzQ39kbci6lfpe5hO7dhqUxy7uypRnvW//78qzBCIaG9c tgiAtUhXQ/njv5g8uS6PrECdZDU9IFyW4uUpOz0jbPCEQjwqisdEMS1xYRgBwdRhWqn8R/ GpMz8THKN1A43HZ8yFVRLQVtq6/NbdWpF+MSNtPhzDNzUy//qxuHLev+eSOkSvur6XnHSY nbW+/mmFGCbyWFGiTmkrIC+3c9as9L0VExYjMI/zHNh9WZ9RnQWPuam8zY8gXg== 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 4T9f8P1zfRz1CLc; Thu, 11 Jan 2024 09:12:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40B9CrDl080923; Thu, 11 Jan 2024 09:12:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40B9CrrK080920; Thu, 11 Jan 2024 09:12:53 GMT (envelope-from git) Date: Thu, 11 Jan 2024 09:12:53 GMT Message-Id: <202401110912.40B9CrrK080920@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: a51421303ac5 - main - cad/py-amaranth: Correct build to be able to determine version w/out patches 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: a51421303ac551c8f5a86204f1408111838697e5 Auto-Submitted: auto-generated The branch main has been updated by yuri: URL: https://cgit.FreeBSD.org/ports/commit/?id=a51421303ac551c8f5a86204f1408111838697e5 commit a51421303ac551c8f5a86204f1408111838697e5 Author: Yuri Victorovich AuthorDate: 2024-01-11 09:11:59 +0000 Commit: Yuri Victorovich CommitDate: 2024-01-11 09:12:46 +0000 cad/py-amaranth: Correct build to be able to determine version w/out patches --- cad/py-amaranth/Makefile | 6 +----- cad/py-amaranth/files/patch-pyproject.toml | 17 ----------------- 2 files changed, 1 insertion(+), 22 deletions(-) diff --git a/cad/py-amaranth/Makefile b/cad/py-amaranth/Makefile index e8f694c65e8d..e6379b6192eb 100644 --- a/cad/py-amaranth/Makefile +++ b/cad/py-amaranth/Makefile @@ -25,13 +25,9 @@ GH_ACCOUNT= amaranth-lang NO_ARCH= yes +MAKE_ENV= PDM_BUILD_SCM_VERSION=${DISTVERSION} # this allows to build from a tarball (otherwise PDM wouldn't be able to determine the version) TEST_ENV= ${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -post-patch: - @${REINPLACE_CMD} \ - -e 's|%%VERSION%%|${DISTVERSION}|' \ - ${WRKSRC}/pyproject.toml - do-install: # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=272771 @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD} diff --git a/cad/py-amaranth/files/patch-pyproject.toml b/cad/py-amaranth/files/patch-pyproject.toml deleted file mode 100644 index e19d759d8171..000000000000 --- a/cad/py-amaranth/files/patch-pyproject.toml +++ /dev/null @@ -1,17 +0,0 @@ ---- pyproject.toml.orig 2023-12-13 09:29:50 UTC -+++ pyproject.toml -@@ -4,12 +4,13 @@ source = "scm" - source = "scm" - - [project] --dynamic = ["version"] -+dynamic = [] - - name = "amaranth" - description = "Amaranth hardware definition language" - authors = [{name = "Amaranth HDL contributors"}] - license = {file = "LICENSE.txt"} -+version = "%%VERSION%%" - - requires-python = "~=3.8" - dependencies = [