Sun Oct 29 17:07:16 2023 UTC ()
python: note that wheel.mk is preferred


(wiz)
diff -r1.41 -r1.42 pkgsrc/lang/python/egg.mk
diff -r1.64 -r1.65 pkgsrc/lang/python/extension.mk
cvs diff -r1.41 -r1.42 pkgsrc/lang/python/egg.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/egg.mk 2023/10/23 06:35:59 1.41
+++ pkgsrc/lang/python/egg.mk 2023/10/29 17:07:15 1.42
@@ -1,24 +1,24 @@ @@ -1,24 +1,24 @@
1# $NetBSD: egg.mk,v 1.41 2023/10/23 06:35:59 wiz Exp $ 1# $NetBSD: egg.mk,v 1.42 2023/10/29 17:07:15 wiz Exp $
 2#
 3# The method used in this Makefile fragment is obsolete.
 4# Please use wheel.mk instead.
 5
2# 6#
3# Common logic to handle Python Eggs 7# Common logic to handle Python Eggs
4# 8#
5.include "../../mk/bsd.fast.prefs.mk" 9.include "../../mk/bsd.fast.prefs.mk"
6.include "../../lang/python/pyversion.mk" 10.include "../../lang/python/pyversion.mk"
7 11
8# This file should be included to package python "distributions" which 
9# use setuptools to create an egg. 
10# 
11# For wheel (*.whl) support, look at wheel.mk. 
12 12
13EGG_NAME?= ${DISTNAME:C/-([^0-9])/_\1/g} 13EGG_NAME?= ${DISTNAME:C/-([^0-9])/_\1/g}
14EGG_INFODIR?= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info 14EGG_INFODIR?= ${EGG_NAME}-py${PYVERSSUFFIX}.egg-info
15 15
16PYDISTUTILSPKG?= yes 16PYDISTUTILSPKG?= yes
17PY_PATCHPLIST?= yes 17PY_PATCHPLIST?= yes
18 18
19# True eggs always have an egg-info directory. egg.mk can also 19# True eggs always have an egg-info directory. egg.mk can also
20# be used for distutils packages, in which case there will be no 20# be used for distutils packages, in which case there will be no
21# egg-info directory. 21# egg-info directory.
22 22
23# Please note that some packages do not provide this directory 23# Please note that some packages do not provide this directory
24# with the last setuptools version that supports python 2.7. 24# with the last setuptools version that supports python 2.7.
cvs diff -r1.64 -r1.65 pkgsrc/lang/python/extension.mk (expand / switch to unified diff)

--- pkgsrc/lang/python/extension.mk 2023/10/26 10:18:34 1.64
+++ pkgsrc/lang/python/extension.mk 2023/10/29 17:07:15 1.65
@@ -1,22 +1,24 @@ @@ -1,22 +1,24 @@
1# $NetBSD: extension.mk,v 1.64 2023/10/26 10:18:34 wiz Exp $ 1# $NetBSD: extension.mk,v 1.65 2023/10/29 17:07:15 wiz Exp $
2 2
3.include "../../lang/python/pyversion.mk" 3.include "../../lang/python/pyversion.mk"
4 4
5# This mk fragment is included to handle packages that create 5# This mk fragment is included to handle packages that create
6# extensions to python, which by definition are those that place files 6# extensions to python, which by definition are those that place files
7# in ${PYSITELIB}. Extensions can be implemented via setuptools as 7# in ${PYSITELIB}. Extensions can be implemented via setuptools as
8# eggs (see egg.mk), via wheels (see wheel.mk), or via more ad hoc 8# eggs (see egg.mk), via wheels (see wheel.mk), or via more ad hoc
9# methods. 9# methods.
 10#
 11# Do not included this file directly, use wheel.mk.
10 12
11.if !empty(PYDISTUTILSPKG:M[yY][eE][sS]) 13.if !empty(PYDISTUTILSPKG:M[yY][eE][sS])
12.include "../../mk/bsd.prefs.mk" 14.include "../../mk/bsd.prefs.mk"
13 15
14PYSETUP?= setup.py 16PYSETUP?= setup.py
15PYSETUPBUILDTARGET?= build 17PYSETUPBUILDTARGET?= build
16PYSETUPBUILDARGS?= # empty 18PYSETUPBUILDARGS?= # empty
17# Python 3.5+ supports parallel building 19# Python 3.5+ supports parallel building
18. if defined(MAKE_JOBS) && ${_PYTHON_VERSION} != 27 20. if defined(MAKE_JOBS) && ${_PYTHON_VERSION} != 27
19. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO]) 21. if !defined(MAKE_JOBS_SAFE) || empty(MAKE_JOBS_SAFE:M[nN][oO])
20PYSETUPBUILDARGS+= -j${MAKE_JOBS} 22PYSETUPBUILDARGS+= -j${MAKE_JOBS}
21. endif 23. endif
22. endif 24. endif