pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/python python: Allow PYDISTUTILSPKG to be overrid...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/897c06abbc68
branches:  trunk
changeset: 384846:897c06abbc68
user:      nia <nia%pkgsrc.org@localhost>
date:      Tue Sep 06 09:05:59 2022 +0000

description:
python: Allow PYDISTUTILSPKG to be overridden on a per-package basis.

This is useful for allowing packages that install python egg metadata
to benefit from the PRINT_PLIST_AWK defined in egg.mk even if they don't
actually use setup.py or normal Python build tools.

diffstat:

 lang/python/egg.mk       |  6 +++---
 lang/python/extension.mk |  4 ++--
 lang/python/srcdist.mk   |  4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diffs (56 lines):

diff -r ef3a5ca7f781 -r 897c06abbc68 lang/python/egg.mk
--- a/lang/python/egg.mk        Tue Sep 06 08:37:10 2022 +0000
+++ b/lang/python/egg.mk        Tue Sep 06 09:05:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.38 2022/04/03 13:59:33 wiz Exp $
+# $NetBSD: egg.mk,v 1.39 2022/09/06 09:05:59 nia Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -13,8 +13,8 @@
 EGG_NAME?=     ${DISTNAME:C/-([^0-9])/_\1/g}
 EGG_INFODIR?=  ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
 
-PYDISTUTILSPKG=        yes
-PY_PATCHPLIST= yes
+PYDISTUTILSPKG?=       yes
+PY_PATCHPLIST?=                yes
 
 # True eggs always have an egg-info directory. egg.mk can also
 # be used for distutils packages, in which case there will be no
diff -r ef3a5ca7f781 -r 897c06abbc68 lang/python/extension.mk
--- a/lang/python/extension.mk  Tue Sep 06 08:37:10 2022 +0000
+++ b/lang/python/extension.mk  Tue Sep 06 09:05:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: extension.mk,v 1.59 2022/01/12 08:34:34 wiz Exp $
+# $NetBSD: extension.mk,v 1.60 2022/09/06 09:05:59 nia Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -8,7 +8,7 @@
 # eggs (see egg.mk), via wheels (see wheel.mk), or via more ad hoc
 # methods.
 
-.if defined(PYDISTUTILSPKG)
+.if !empty(PYDISTUTILSPKG:M[yY][eE][sS])
 .include "../../mk/bsd.prefs.mk"
 
 PYSETUP?=              setup.py
diff -r ef3a5ca7f781 -r 897c06abbc68 lang/python/srcdist.mk
--- a/lang/python/srcdist.mk    Tue Sep 06 08:37:10 2022 +0000
+++ b/lang/python/srcdist.mk    Tue Sep 06 09:05:59 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: srcdist.mk,v 1.41 2021/12/30 21:33:09 tnn Exp $
+# $NetBSD: srcdist.mk,v 1.42 2022/09/06 09:05:59 nia Exp $
 
 .include "../../lang/python/pyversion.mk"
 
@@ -7,7 +7,7 @@
 PYSUBDIR=      ${DISTNAME}
 WRKSRC=                ${WRKDIR}/${PYSUBDIR}
 
-.if defined(PYDISTUTILSPKG)
+.if !empty(PYDISTUTILSPKG:M[yY][eE][sS])
 # This is used for standard modules shipped with Python but build as
 # separate packages.
 



Home | Main Index | Thread Index | Old Index