Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 6 Feb 2023 02:54:54 GMT
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: d6583d67b69d - main - devel/py-importlib-metadata: Fix circular dependency problem
Message-ID:  <202302060254.3162ssvU088870@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d6583d67b69dbf690e6f102e1aec799cb7fd564a

commit d6583d67b69dbf690e6f102e1aec799cb7fd564a
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2023-02-06 02:52:52 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2023-02-06 02:54:51 +0000

    devel/py-importlib-metadata: Fix circular dependency problem
    
    ... introduced by USE_PYTHON=pep517.
    
    PR:             269363
    Reported by:    John Hein <jcfyecrayz@liamekaens.com>
---
 devel/py-importlib-metadata/Makefile | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/devel/py-importlib-metadata/Makefile b/devel/py-importlib-metadata/Makefile
index 461323b77c3d..7b11902560c9 100644
--- a/devel/py-importlib-metadata/Makefile
+++ b/devel/py-importlib-metadata/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	importlib-metadata
-PORTVERSION=	6.0.0
+DISTVERSION=	6.0.0
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	PYPI
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
@@ -18,7 +19,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=56:devel/py-setuptools@${PY_FL
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}zipp>=0.5:devel/py-zipp@${PY_FLAVOR}
 
 USES=		python:3.6+
-USE_PYTHON=	pep517 autoplist pytest
+USE_PYTHON=	distutils autoplist pytest
 
 NO_ARCH=	yes
 
@@ -28,4 +29,10 @@ NO_ARCH=	yes
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}typing-extensions>=3.6.4:devel/py-typing-extensions@${PY_FLAVOR}
 .endif
 
+pre-configure: # importlib-metadata introduces circular dependency when built with USE_PYTHON=pep517, see bug#269363
+	@( \
+		${ECHO} "from setuptools import setup" && \
+		${ECHO} "setup()" \
+	) > ${WRKSRC}/setup.py
+
 .include <bsd.port.post.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202302060254.3162ssvU088870>