From nobody Sat Feb 25 17:35:46 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 4PPDSL2VMhz3tgWR; Sat, 25 Feb 2023 17:35:46 +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 4PPDSL22FGz3t5H; Sat, 25 Feb 2023 17:35:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677346546; 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=ef4MqsoLVDQbd4Bbchoi0wO+sCYC2a6JyopIspuTheI=; b=qR4T89ClOv2DO0WiXu0vietAEElPIOX7A0T1DqIo6FjzlptJnNrw00qQpNTnqVcO4wMNHj imp8fhNmgPJ3WPSkSy/li97TWlCYPamLhIdeihVIVHgW2iQ6gIQggfBmCjpG+xKqME9MZi 7NaUg58Fo3lbiADyQgGiQE/BgHip7hMfKSgQelaKhl5MaXIF+Cw+d+MpkHNT8bmiPEsXd5 fRGLipPQzt7U7gGnnuMBBDtIGWf+brooXDNRxNKWwVet/DYolGpVYRHi2te4OdwNlQtCbt 84BqtrMNPyjdTuULfPb2hQfxoF5yQnFQSsIMWuBNkBFXeoJRQ28tTruJummpxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677346546; 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=ef4MqsoLVDQbd4Bbchoi0wO+sCYC2a6JyopIspuTheI=; b=VSDVBeUqFHPIUQ+tNMyaGRxJt7oY2AyV+8B4Nwxi1NxW1uZN0A2AjGZIGoQU8n0KUvU1MK tHc+DHkxXs3xt0BIeODy0Dtnti9jnsr7iGZbkwVPN4yfWWYVIsYd9ovOha4rOnjyzUsomP PIjrcxt1hxG8RhdEPWwL21mEFRQ54Bai2VipgBc6Ni4GdGlADHoG3o5sQfAEQcHoHPFdCp 4xo/+IwwyAGX3L7PC7yvIbB1A7VE7YsbmN+5uNg5AOckM8P8LkMk5ryE4rYT0hCZZ6hQdu mis3Qx/3k3s489NLDKU0ft2NUCl5XE7zRtc+kiEW1fdJ1nTvFKcnJxSWLlK8HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677346546; a=rsa-sha256; cv=none; b=tRkstGYB4/ZeWvHeBIGidReozf9Ndmi7N83q47fXiuK57gWY9q38kJNQR/mngqh/9M604K 08CAes7zaY0xmahXNgsj4N5MWfNWPcPWCHmy6s218jHxEBGhrs++Llg3kqVr0EFTdt0DiK 0L0WGLVTf/4k3b+/HlzVe+XWDxQy1h5wbN2t7ByjB5oWdY6CB59QL3PBcDM6zJbisApeIJ 3823c92ti2gB63bkCRaXocLOLHOWzkvTf1w9uBCPjgUaeXlHOhve5U6PFs6SwomSHlrXYy +2iW/CK/IXzgVvLnRbIJ3TjUUTskgLMnVBM/NJFJ4NqF40e54Cqdh4OVM6skmg== 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 4PPDSL15CGz1C2R; Sat, 25 Feb 2023 17:35:46 +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 31PHZkTH072030; Sat, 25 Feb 2023 17:35:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 31PHZkWD072029; Sat, 25 Feb 2023 17:35:46 GMT (envelope-from git) Date: Sat, 25 Feb 2023 17:35:46 GMT Message-Id: <202302251735.31PHZkWD072029@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Charlie Li Subject: git: 9fbe5f4d774c - main - python.mk: explicitly pass ${PREFIX} to ${PEP517_INSTALL_CMD} 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: vishwin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9fbe5f4d774c1f818ec604a438356311f3bc76ee Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by vishwin: URL: https://cgit.FreeBSD.org/ports/commit/?id=9fbe5f4d774c1f818ec604a438356311f3bc76ee commit 9fbe5f4d774c1f818ec604a438356311f3bc76ee Author: Charlie Li AuthorDate: 2023-02-10 20:04:58 +0000 Commit: Charlie Li CommitDate: 2023-02-25 17:35:32 +0000 python.mk: explicitly pass ${PREFIX} to ${PEP517_INSTALL_CMD} Otherwise the stage prefix is ${PYTHONBASE} by default. Reported by: John Hein PR: 269472 --- Mk/Uses/python.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk index 7017308e7c9c..ec86003565ee 100644 --- a/Mk/Uses/python.mk +++ b/Mk/Uses/python.mk @@ -185,7 +185,7 @@ # default: ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} # # PEP517_INSTALL_CMD - Command sequence for a PEP-517 install frontend that installs a wheel. -# default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl +# default: ${PYTHON_CMD} -m installer -d ${STAGEDIR} -p ${PREFIX} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl # # PEP517_INSTALL_DEPEND - Port needed to execute ${PEP517_INSTALL_CMD}. # default: ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR} @@ -661,7 +661,7 @@ PYDISTUTILS_EGGINFODIR?=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} # PEP-517 support PEP517_BUILD_CMD?= ${PYTHON_CMD} -m build -n -w PEP517_BUILD_DEPEND?= ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} -PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer -d ${STAGEDIR} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl +PEP517_INSTALL_CMD?= ${PYTHON_CMD} -m installer -d ${STAGEDIR} -p ${PREFIX} --no-compile-bytecode ${BUILD_WRKSRC}/dist/${PORTNAME:C/[-_]+/_/g}-${PORTVERSION}-*.whl PEP517_INSTALL_DEPEND?= ${PYTHON_PKGNAMEPREFIX}installer>0:devel/py-installer@${PY_FLAVOR} # nose support