From nobody Thu Aug 3 11:12:01 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 4RGmQ95Ly7zZZVQ; Thu, 3 Aug 2023 11:12:01 +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 4RGmQ94YrHz3SXk; Thu, 3 Aug 2023 11:12:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691061121; 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=dImYmf8mWlmvYYxhq++dg6Zu/oa8r2RqtWo2btqDVZc=; b=JlZpjtY07mS5fbQn9GV2g5vCEs7+JkPyAZPadMDny2saRCqM7FOcCZAIY/1XpxovyoLVyT TSvMP76sdzrbpjaMOKK7KjTwGyx5tbntJ3p6I07+Hv1DOIFJO9tP2PXG5ApSCerTfrr15C TZUo4qmAbrrg+Gni+h2MlGqARU7xiBDS83xyd9kdETffc/1rMfPH3bkKsKLrvdmUpvqCMs dRE6TRHZB3kZzLiFVZZTx50aG9396lsfYav0pV6gPYv7AKpjUfQGQ1pDqXWyNhqJoNiqs/ RJ09CrnSBoKdcP92a0gpa0w+FDSjEtAEZmfnFek2YsRFmIFsDZfuyqgEgyUDEg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691061121; 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=dImYmf8mWlmvYYxhq++dg6Zu/oa8r2RqtWo2btqDVZc=; b=XdFzCzfvIPY3/ylJYk7R2dGj/oM2b8lmMd6K9IEsQRDr4mVsFmCqi6xlaQolYhPsPFz12y 66Ew+1njJs9JA5nOkcYElmrbNrLRh0ISJJe3i1471Y73dgLHxBpspUAnbE6bY1EUExO7nL opGmgJHnnnTz8AdEYLwEan+M2LbkHhvHINF6dwshw6ryUtILDsBXWW21e1Xx2Jqj2wwQAQ KeuS0BYE1vdL9m80WAc8olF7aX7zHne0jhyRHyNwwv/hpH/abef7juwBZNXHM8yqgNdN/F ifSuzmyGTxvafxu79csPtus7R4F6P0QYGZNtmdUzE1ePv6Glai5NZ5G/SCKeeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691061121; a=rsa-sha256; cv=none; b=JydVow0hR56YG6Fs2s3GsAHHFVZsq7+B9RQAjetzsojE/CZWcrSsgO+HoRPCCt4DECdJOI exEcpMay8BJNWNxJUwXdwp79KNu2ydOdlGgdfrrJZpX5pp+4JbdPvEo7IlkR0AruCPSP97 A3RG6wjLSuxpyZOgXLIQzf6NptXK/Nmp1reIcOU2sZUlGEivwhUYyE39+0gOGQ8av/Rgtf U8qkrqXraQFMX5aqUXf4LlteQlJ69tCPhJg+LstYKYcg1LwWDIMbhmCfIUbNry7Pi35PrI H9mffJNsHtFZiv+DrsuJSKkHD/cMhSoeOspSs0wT+hyxJ8VJRcXcUqiqBFZVTw== 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 4RGmQ93MVcz49D; Thu, 3 Aug 2023 11:12:01 +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 373BC1oF006247; Thu, 3 Aug 2023 11:12:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 373BC1iP006246; Thu, 3 Aug 2023 11:12:01 GMT (envelope-from git) Date: Thu, 3 Aug 2023 11:12:01 GMT Message-Id: <202308031112.373BC1iP006246@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 00ae5289b231 - main - devel/py-maturin: Fix command name for non-default Python versions 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: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 00ae5289b23194d0b79413e62abc6ceff960fb09 Auto-Submitted: auto-generated The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=00ae5289b23194d0b79413e62abc6ceff960fb09 commit 00ae5289b23194d0b79413e62abc6ceff960fb09 Author: John Hein AuthorDate: 2023-08-03 11:04:59 +0000 Commit: Kai Knoblich CommitDate: 2023-08-03 11:04:59 +0000 devel/py-maturin: Fix command name for non-default Python versions If devel/py-maturin is built for a non-default python flavor (e.g., 'make FLAVOR=py38'), the port installs bin/maturin- and does not install bin/maturin which is normal and expected. The site-packages/maturin/__init__.py file, however, explicitly defines the command to use as 'maturin'. Because of this when using maturin to build other ports, they can fail with "No such file or directory: 'maturin'". [1] Fix the issue by aligning the command name to the actual Python flavor. PR: 272618, 272600 [1] Reported by: John W. O'Brien [1] MFH: 2023Q3 (after 1 week) --- devel/py-maturin/Makefile | 3 ++- devel/py-maturin/files/patch-maturin-__init__.py | 11 +++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/devel/py-maturin/Makefile b/devel/py-maturin/Makefile index 25d73bf046be..b3600318dbe1 100644 --- a/devel/py-maturin/Makefile +++ b/devel/py-maturin/Makefile @@ -1,7 +1,7 @@ PORTNAME= maturin DISTVERSIONPREFIX= v DISTVERSION= 0.13.2 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -345,6 +345,7 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}tomli>=0.10.1:textproc/py-tomli@${PY_FLAVOR post-patch: @${RM} ${WRKSRC}/pyproject.toml + ${REINPLACE_CMD} 's|%%PYTHON_VER%%|${PYTHON_VER}|' ${WRKSRC}/maturin/__init__.py # The binary is usually built via setup.py which uses different compiler flags. # That line is patched out there to use the compiler flags from the Ports diff --git a/devel/py-maturin/files/patch-maturin-__init__.py b/devel/py-maturin/files/patch-maturin-__init__.py new file mode 100644 index 000000000000..5c1fe49c81d8 --- /dev/null +++ b/devel/py-maturin/files/patch-maturin-__init__.py @@ -0,0 +1,11 @@ +--- maturin/__init__.py.orig 2022-08-14 11:03:56 UTC ++++ maturin/__init__.py +@@ -52,7 +52,7 @@ def _build_wheel( + # PEP 517 specifies that only `sys.executable` points to the correct + # python interpreter + command = [ +- "maturin", ++ "maturin-%%PYTHON_VER%%", + "pep517", + "build-wheel", + "-i",