From 153f2806ee41dfb327dd519233f74b4f0ea65813 Mon Sep 17 00:00:00 2001 From: sthen Date: Wed, 16 Nov 2022 20:05:06 +0000 Subject: [PATCH] update to py3-build-0.9.0 switch to using py-build itself (from WRKDIR) to run the build (with a setuptools backend as a BUILD_DEPENDS) and drop MODPY_SETUPTOOLS, getting rid of the setuptools RUN_DEPENDS. --- devel/py-build/Makefile | 21 ++++++++++++++++----- devel/py-build/distinfo | 4 ++-- devel/py-build/pkg/PLIST | 18 +++++++++++------- 3 files changed, 29 insertions(+), 14 deletions(-) diff --git a/devel/py-build/Makefile b/devel/py-build/Makefile index d110ff22029..36d19a10b5a 100644 --- a/devel/py-build/Makefile +++ b/devel/py-build/Makefile @@ -1,10 +1,9 @@ COMMENT = simple, correct PEP 517 build frontend -MODPY_EGG_VERSION = 0.8.0 +MODPY_EGG_VERSION = 0.9.0 DISTNAME = build-${MODPY_EGG_VERSION} PKGNAME = py-${DISTNAME} -REVISION = 0 CATEGORIES = devel @@ -15,16 +14,28 @@ PERMIT_PACKAGE = Yes MODULES = lang/python MODPY_PI = Yes - -MODPY_SETUPTOOLS = Yes +NO_TEST = Yes FLAVOR = python3 FLAVORS = python3 -NO_TEST = Yes +BUILD_DEPENDS = devel/py-installer${MODPY_FLAVOR} \ + devel/py-setuptools${MODPY_FLAVOR} \ + devel/py-wheel${MODPY_FLAVOR} \ + ${RUN_DEPENDS} RUN_DEPENDS = devel/py-pep517${MODPY_FLAVOR} \ sysutils/py-packaging${MODPY_FLAVOR} \ textproc/py-tomli${MODPY_FLAVOR} +# point to the copy of py-build in WRKSRC for a self-hosting build +# replicate most of MODPY_PYBUILD steps because we can't use it directly +do-build: + cd ${WRKSRC} && PYTHONPATH=${WRKSRC}/src ${MODPY_BIN} \ + -sBm build -w --no-isolation + +do-install: + ${INSTALL_DATA_DIR} ${WRKINST}${MODPY_LIBDIR}; \ + ${_MODPY_RUNBIN} -m installer -d ${WRKINST} ${WRKSRC}/dist/*.whl + .include diff --git a/devel/py-build/distinfo b/devel/py-build/distinfo index d6353b892a9..9cdd8c672d9 100644 --- a/devel/py-build/distinfo +++ b/devel/py-build/distinfo @@ -1,2 +1,2 @@ -SHA256 (build-0.8.0.tar.gz) = iHptRxyQGxpuZXTrru67ReUmmnnQlf6aj4jWYU7S5fA= -SIZE (build-0.8.0.tar.gz) = 17067 +SHA256 (build-0.9.0.tar.gz) = GgdyTokcvYmJIxRet3Uu52U2dMURN465x2kaqxYSvDw= +SIZE (build-0.9.0.tar.gz) = 17450 diff --git a/devel/py-build/pkg/PLIST b/devel/py-build/pkg/PLIST index 777a8453193..7c8d18c6838 100644 --- a/devel/py-build/pkg/PLIST +++ b/devel/py-build/pkg/PLIST @@ -1,18 +1,22 @@ bin/pyproject-build lib/python${MODPY_VERSION}/site-packages/build/ -lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/ -lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO -lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt -lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt -lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/entry_points.txt -lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/requires.txt -lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt +lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}.dist-info/ +lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}.dist-info/LICENSE +lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}.dist-info/METADATA +lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}.dist-info/RECORD +lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}.dist-info/WHEEL +lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}.dist-info/entry_points.txt +lib/python${MODPY_VERSION}/site-packages/build-${MODPY_EGG_VERSION}.dist-info/top_level.txt lib/python${MODPY_VERSION}/site-packages/build/__init__.py lib/python${MODPY_VERSION}/site-packages/build/__main__.py ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}/ +lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}__main__.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}env.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}env.${MODPY_PYC_MAGIC_TAG}pyc +lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION} lib/python${MODPY_VERSION}/site-packages/build/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc lib/python${MODPY_VERSION}/site-packages/build/env.py lib/python${MODPY_VERSION}/site-packages/build/py.typed