From nobody Tue Mar 21 19:34:43 2023 X-Original-To: dev-commits-ports-all@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 4Ph1yW2l7Vz40l7s; Tue, 21 Mar 2023 19:34:43 +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 4Ph1yW2HTwz3F2G; Tue, 21 Mar 2023 19:34:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679427283; 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=Rj+aCfcs611v5tIHJ+qmrrv7CDZ2CxNya3bdYF+spC0=; b=pcArl0VZwVuYf1UsPECE1FbZazWySmHwG+61bPMeIlTGQ4cewiImeCb4KniLjGCijRKHCV w2dDPgPsugJLoj5Ite/I3Up/P/385zgo+FFhUMxpoOuddXKP9IPMdfctfI1R5RXZGBoRxA ucteeP4X5NwXvnwhzVygAneVarozuoSVxXICxLah7n2Z0EQFRNyzeYV7ilOHkNtsUKn4qZ 7vVUe9mAACs2+T1qDOrO4TJ12ArMbaxFQ+0kQ7oHAdEgorMLpv5qgy0ZN3RFPc01yHI6MC pulTlzfZ7LImwkxMQhIt5NYIdpIEZZFK5krisgOSipqNyYi4IWwqk6YOn6ofaw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1679427283; 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=Rj+aCfcs611v5tIHJ+qmrrv7CDZ2CxNya3bdYF+spC0=; b=DyKfd8V9J7DTjsqBcG+wE0gF8v0t7HbrtS6R4Pm68+R9Jw6+y3gPNO66+U19HYLp0VGUN0 zO0rXfjBd388YyTqh0Eq4NpFEIj1BpfDl8yQXEKwhwFsDHVIbsmoSr4lh9BJDfluPfJ/0F 1dLNXCrCW09qAjP61PbD+oJ12ok9rp8Rd/CJi9ajmtFgQ8semR6gF1Sk6GsWLzORVpO5WJ RqW2Zjav77wRVm5/FIPPlbVicQHNCtr03zGb1hEWMWWc8eyff5MTE/zL9fnjq1EOxISbji +AOvr0J9zhEJgF1s9JvaugnKTRSVCKaXIGw1u+gk+wJZji1S6VrM3inDkSemiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1679427283; a=rsa-sha256; cv=none; b=gCvjaxv3KiKTcqruh7ifgdzKdOMRb3Omavij2acLgQQ1z5AiTxHS57LDjXvvh6GPYFq8yI a9oi9bxCnkvBQ/2CpSvUPM6Vf7Sk5XhDn3NMKZjFwxXmr6hCSU6oEZ4De0TvXVoHVoI0iH BsEgs3GFgyFSRpNTPTeJ3eTatNO69fMPCimQPKBOXv+0TjVPl+/uhnk2k3awLqo6vLbkWc ZHJ6NDddEymb1ay/OBBsENJDWQf3ryLoshuU9b9fD8Nj7w416+4LnOlwxHJ0vmyzrPQkHF DtuzepzawJMk/24bf4/ZHYkHFkQyXHuK5oyOQUdQHBbRt0FKHg9pC6RK4OHkTQ== 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 4Ph1yW1JsNzPws; Tue, 21 Mar 2023 19:34:43 +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 32LJYhj1053910; Tue, 21 Mar 2023 19:34:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 32LJYhkk053909; Tue, 21 Mar 2023 19:34:43 GMT (envelope-from git) Date: Tue, 21 Mar 2023 19:34:43 GMT Message-Id: <202303211934.32LJYhkk053909@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: bbd8f024073e - main - Mk/Uses/python.mk: Use long options for easier reading (part of de6965254c3a007efcf697c3d455b54d2aeb2383) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbd8f024073e59797f6a2b7171d74195350729da Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=bbd8f024073e59797f6a2b7171d74195350729da commit bbd8f024073e59797f6a2b7171d74195350729da Author: Po-Chuan Hsieh AuthorDate: 2023-03-21 18:53:52 +0000 Commit: Po-Chuan Hsieh CommitDate: 2023-03-21 19:22:25 +0000 Mk/Uses/python.mk: Use long options for easier reading (part of de6965254c3a007efcf697c3d455b54d2aeb2383) --- Mk/Uses/python.mk | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index b4155814d617..7199abd73363 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -141,7 +141,7 @@ # default: ${PYTHONBASE}/bin/${PYTHON_VERSION} # # PEP517_BUILD_CMD - Command sequence for a PEP-517 build frontend that builds a wheel. -# default: ${PYTHON_CMD} -m build -n -w ${PEP517_BUILD_CONFIG_SETTING} +# default: ${PYTHON_CMD} -m build --no-isolation --wheel ${PEP517_BUILD_CONFIG_SETTING} # # PEP517_BUILD_DEPEND - Port needed to execute ${PEP517_BUILD_CMD}. # default: ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} @@ -151,7 +151,7 @@ # default: # # PEP517_INSTALL_CMD - Command sequence for a PEP-517 install frontend that installs a wheel. -# default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} -p ${PREFIX} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${DISTVERSION}-*.whl +# default: ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --no-compile-bytecode --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}-*.whl # # PEP517_INSTALL_DEPEND - Port needed to execute ${PEP517_INSTALL_CMD}. # default: ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR} @@ -678,10 +678,10 @@ PYDISTUTILS_EGGINFO?= ${PYDISTUTILS_PKGNAME:C/[^A-Za-z0-9.]+/_/g}-${PYDISTUTILS_ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} # PEP-517 support -PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build -n -w ${PEP517_BUILD_CONFIG_SETTING} -PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} -PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer -d ${STAGEDIR} -p ${PREFIX} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${DISTVERSION}-*.whl -PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR} +PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build --no-isolation --wheel ${PEP517_BUILD_CONFIG_SETTING} +PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>=0:devel/py-build@${PY_FLAVOR} +PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer --destdir ${STAGEDIR} --no-compile-bytecode --prefix ${PREFIX} ${BUILD_WRKSRC}/dist/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}-*.whl +PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>=0:devel/py-installer@${PY_FLAVOR} # nose support . if defined(_PYTHON_FEATURE_NOSE) @@ -901,7 +901,7 @@ do-install: @${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} @cd ${INSTALL_WRKSRC} && ${SETENV} ${MAKE_ENV} ${PEP517_INSTALL_CMD} @${PYTHON_CMD} -B ${PORTSDIR}/Mk/Scripts/strip_RECORD.py \ - ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C/[-_]+/_/g}-${DISTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} + ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/${PORTNAME:C|[-_]+|_|g}-${DISTVERSION}.dist-info/RECORD >> ${_PYTHONPKGLIST} @${REINPLACE_CMD} -e 's|^|${PYTHONPREFIX_SITELIBDIR}/|' \ -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../etc/|etc/|' \ -e 's|^${PYTHONPREFIX_SITELIBDIR}/../../../bin/|bin/|' \