tech-pkg archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

egg.mk and do-*



Hello,
so, since xentools415 has been converted to python/egg.mk (from extention.mk)
we get a warning about do-build and do-install being redefined.
The do-build and do-install targets from python are being ignored, and indeed
xentools415 doesn't want to use them. The attached patch allows a client
package from python/egg.mk to choose to not use python's do-* targets,
by defining PYDISTUTILSPKG to no.

Is it OK to commit ?

-- 
Manuel Bouyer <bouyer%antioche.eu.org@localhost>
     NetBSD: 26 ans d'experience feront toujours la difference
--
Index: lang/python/egg.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/egg.mk,v
retrieving revision 1.38
diff -u -r1.38 egg.mk
--- lang/python/egg.mk	3 Apr 2022 13:59:33 -0000	1.38
+++ lang/python/egg.mk	4 Jul 2022 16:22:53 -0000
@@ -13,7 +13,7 @@
 EGG_NAME?=	${DISTNAME:C/-([^0-9])/_\1/g}
 EGG_INFODIR?=	${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 
-PYDISTUTILSPKG=	yes
+PYDISTUTILSPKG?=yes
 PY_PATCHPLIST=	yes
 
 # True eggs always have an egg-info directory. egg.mk can also
Index: lang/python/extension.mk
===================================================================
RCS file: /cvsroot/pkgsrc/lang/python/extension.mk,v
retrieving revision 1.59
diff -u -r1.59 extension.mk
--- lang/python/extension.mk	12 Jan 2022 08:34:34 -0000	1.59
+++ lang/python/extension.mk	4 Jul 2022 16:22:53 -0000
@@ -8,7 +8,7 @@
 # eggs (see egg.mk), via wheels (see wheel.mk), or via more ad hoc
 # methods.
 
-.if defined(PYDISTUTILSPKG)
+.if defined(PYDISTUTILSPKG) && empty(PYDISTUTILSPKG:M[nN][oO])
 .include "../../mk/bsd.prefs.mk"
 
 PYSETUP?=		setup.py
Index: sysutils/xentools415/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/sysutils/xentools415/Makefile,v
retrieving revision 1.18
diff -u -r1.18 Makefile
--- sysutils/xentools415/Makefile	1 Jul 2022 13:07:37 -0000	1.18
+++ sysutils/xentools415/Makefile	4 Jul 2022 16:23:07 -0000
@@ -67,6 +66,8 @@
 REPLACE_PYTHON+=	tools/python/scripts/verify-stream-v2
 REPLACE_PYTHON+=	tools/xenmon/xenmon.py tools/misc/xencov_split
 
+PYDISTUTILSPKG=		NO # for egg.mk, avoid redefinition of do-build
+
 REPLACE_PERL+=		tools/firmware/rombios/makesym.perl
 REPLACE_PERL+=		tools/qemu-xen-traditional/texi2pod.pl
 REPLACE_PERL+=		tools/examples/xeninfo.pl


Home | Main Index | Thread Index | Old Index