Received: by mail.netbsd.org (Postfix, from userid 605) id 66B7684F17; Tue, 23 Jan 2024 19:59:27 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 940A384F10 for ; Tue, 23 Jan 2024 19:59:26 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 59MMw_2hUYn4 for ; Tue, 23 Jan 2024 19:59:26 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 0654384F0D for ; Tue, 23 Jan 2024 19:59:25 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E4DFCFA42; Tue, 23 Jan 2024 19:59:25 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1706039965292640" MIME-Version: 1.0 Date: Tue, 23 Jan 2024 19:59:25 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/lang/python To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20240123195925.E4DFCFA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1706039965292640 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Tue Jan 23 19:59:25 UTC 2024 Modified Files: pkgsrc/lang/python: wheel.mk Log Message: wheel.mk: introduce PYSETUPSUBDIR To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 pkgsrc/lang/python/wheel.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1706039965292640 Content-Disposition: inline Content-Length: 2042 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/lang/python/wheel.mk diff -u pkgsrc/lang/python/wheel.mk:1.13 pkgsrc/lang/python/wheel.mk:1.14 --- pkgsrc/lang/python/wheel.mk:1.13 Tue Jan 9 22:48:13 2024 +++ pkgsrc/lang/python/wheel.mk Tue Jan 23 19:59:25 2024 @@ -1,4 +1,4 @@ -# $NetBSD: wheel.mk,v 1.13 2024/01/09 22:48:13 gutteridge Exp $ +# $NetBSD: wheel.mk,v 1.14 2024/01/23 19:59:25 adam Exp $ # # Build and install Python wheels # @@ -18,8 +18,9 @@ # WHEEL_ARGS: additional arguments to pass during build of the wheel PY_PATCHPLIST?= yes +PYSETUPSUBDIR?= # empty -WHEELFILE?= ${WRKSRC}/dist/*.whl +WHEELFILE?= ${WRKSRC}/${PYSETUPSUBDIR}/dist/*.whl WHEEL_NAME?= ${DISTNAME:C/-([^0-9])/_\1/g} _WHEEL_INFODIR= ${WHEEL_NAME}.dist-info PLIST_SUBST+= WHEEL_INFODIR=${_WHEEL_INFODIR} @@ -30,25 +31,25 @@ PRINT_PLIST_AWK+= { gsub(/${_WHEEL_INFOD .if !target(do-build) TOOL_DEPENDS+= ${PYPKGPREFIX}-build>=0:../../devel/py-build do-build: - ${RUN} cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${TOOL_PYTHONBIN} \ - -m build --wheel --skip-dependency-check --no-isolation \ - ${WHEEL_ARGS} + ${RUN} cd ${WRKSRC}/${PYSETUPSUBDIR} && \ + ${SETENV} ${MAKE_ENV} ${TOOL_PYTHONBIN} \ + -m build --wheel --skip-dependency-check --no-isolation ${WHEEL_ARGS} .endif .if !target(do-install) TOOL_DEPENDS+= ${PYPKGPREFIX}-installer>=0.7.0nb1:../../misc/py-installer do-install: - ${RUN} cd ${WRKSRC} && \ - ${SETENV} ${INSTALL_ENV} \ - ${TOOL_PYTHONBIN} -m installer --destdir ${DESTDIR:Q} \ - --prefix ${PREFIX:Q} ${WHEELFILE} + ${RUN} cd ${WRKSRC}/${PYSETUPSUBDIR} && \ + ${SETENV} ${INSTALL_ENV} ${TOOL_PYTHONBIN} \ + -m installer --destdir ${DESTDIR:Q} --prefix ${PREFIX:Q} ${WHEELFILE} .endif USE_PYTEST?= yes .if !target(do-test) && ${USE_PYTEST:Myes} TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test do-test: - ${RUN} cd ${WRKSRC} && ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} + ${RUN} cd ${WRKSRC}/${PYSETUPSUBDIR} && \ + ${SETENV} ${TEST_ENV} pytest-${PYVERSSUFFIX} .endif .include "../../lang/python/extension.mk" --_----------=_1706039965292640--