From nobody Thu Aug 10 12:17:13 2023 X-Original-To: dev-commits-ports-branches@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 4RM5XB0TDcz4mBSj; Thu, 10 Aug 2023 12:17:14 +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 4RM5X96Y9Qz3GGw; Thu, 10 Aug 2023 12:17:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691669833; 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=7iclmvjhxEuSdvYz9EQEjZXy8r99a8qJebdXiyMPyrU=; b=GJCHRXi7JjqHUOqncD6ZmMrX9rNpb+x/aOpBuFhtXrfdEcFB0fpv0apZLVVJ52/NScgpmp XH0T4tdzFAXCaUlWAfgibDl2d7hjSJrtOsZTNY/Ay1tx8ZESKGNg6ajqLMef9sus+0x9yo TfazmTl3XEyeUgW9/j7j4j8ci85jEMnjSeH48dijWD2AymavhvssKpU9Xnah+BvFU2I98n 80wG0XWnwFq2ejpzVpTBJQaiC5xhafEtEgM4NE1Lr6SHr0lAtk4s+CtUDG/PtjjASlTXOw fHzTQ5IHCOhURZcMy6M62RrmlNjlR72BN/rxrUpkClk9S2q9v+Z65WJqrN7b3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691669833; 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=7iclmvjhxEuSdvYz9EQEjZXy8r99a8qJebdXiyMPyrU=; b=qY2O0mWzfX9oxNG48N7ItXQ54DP3BzMEjZd575LNOx7wkmCO3ITAca5VDYXVWuWDY04vqr fYZ1a0Yys66wmv1/Xr+6xHvTrEunWeYWl49RskEw6TSOxnVZ5sBh4evIoDiLpgXfUlVR/T UbtXVFNgg34meA+t0100tRWcVW7vOozGvPLi64m12b7HmyO1Vyo3jU4T39dYQauF9LAE1a ugzY6uTvT6b5gISryA/j1qJa46r/4y44vOde+nsSpjBBUvh7ZiKe3caWCnIu/9N/VLn0xi TxxVHCQ/2SWoWmt+kNPWLaQvSnDp6JCObm7jabW8orpIMIcB3XBmkWK3nXC4DA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691669833; a=rsa-sha256; cv=none; b=pv204JOwOjyKnSYOqYHfVk984xPbaKRy7DB+k6T5MMUmSAWMSkdd77uZtX9Ek/vRir534E BtjuHDlwerqU2dMFvCDdZl5hsXxVjXh7zsAnrAqeuzakotIM/sX1vcdha9VCI8MfAnZ6TQ yvMFF8xRPlE8nycoeQ4fF7p+nrsYV1p14Xp+/H2NPDZkm9T+lMq8gr5y/5gCTLsRePaAVE vNe/1UBFZbOJCg59ZzMu7YCjgi6AEFwC0o90/qeaTQjRCPlEqwgbWXCYbVaxEvmXUSGkDo sqEKBKZQWMa7qnupIm4Gd282kVzes03Vk2QCTwqJLtH3nAgQsFKuRlOOWzAD3A== 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 4RM5X95cCkzwkh; Thu, 10 Aug 2023 12:17:13 +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 37ACHDmJ009690; Thu, 10 Aug 2023 12:17:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ACHD4U009687; Thu, 10 Aug 2023 12:17:13 GMT (envelope-from git) Date: Thu, 10 Aug 2023 12:17:13 GMT Message-Id: <202308101217.37ACHD4U009687@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Kai Knoblich Subject: git: 0199fbab9ae5 - 2023Q3 - devel/py-maturin: Fix command name for non-default Python versions List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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/2023Q3 X-Git-Reftype: branch X-Git-Commit: 0199fbab9ae53912fd05dcacd3348a32a28de3a7 Auto-Submitted: auto-generated The branch 2023Q3 has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=0199fbab9ae53912fd05dcacd3348a32a28de3a7 commit 0199fbab9ae53912fd05dcacd3348a32a28de3a7 Author: John Hein AuthorDate: 2023-08-03 11:04:59 +0000 Commit: Kai Knoblich CommitDate: 2023-08-10 12:14:55 +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) (cherry picked from commit 00ae5289b23194d0b79413e62abc6ceff960fb09) --- 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 8f198ff63816..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= 8 +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",