CVS commit: pkgsrc/lang/python

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Feb  8 12:09:30 UTC 2017

Modified Files:
        pkgsrc/lang/python: egg.mk

Log Message:
Add new BOOTSTRAP_SETUPTOOLS variable.

setuptools is one of the basic methods to install python packages.
However, since 34.0 it does not provide its dependencies any longer;
so they need to be installed from pkgsrc.

For bootstrapping, python itself comes with a copy of (pip and) setuptools.
Use this copy to install the necessary packages. They need to be
marked by BOOTSTRAP_SETUPTOOLS=yes for this.


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/lang/python/egg.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/python/egg.mk
diff -u pkgsrc/lang/python/egg.mk:1.26 pkgsrc/lang/python/egg.mk:1.27
--- pkgsrc/lang/python/egg.mk:1.26      Sat Feb  4 21:39:05 2017
+++ pkgsrc/lang/python/egg.mk   Wed Feb  8 12:09:30 2017
@@ -1,4 +1,4 @@
-# $NetBSD: egg.mk,v 1.26 2017/02/04 21:39:05 wiz Exp $
+# $NetBSD: egg.mk,v 1.27 2017/02/08 12:09:30 wiz Exp $
 #
 # Common logic to handle Python Eggs
 #
@@ -37,7 +37,21 @@ PRINT_PLIST_AWK+=    { gsub(/${PYVERSSUFFIX
 
 _PYSETUPTOOLSINSTALLARGS=      --single-version-externally-managed
 
+# py-setuptools depends on a couple py-* packages that need to be installed
+# beforehand. Of course, those can not be built and installed using py-setuptools
+# itself; so use the setuptools version included with python itself for installing
+# them.
+BOOTSTRAP_SETUPTOOLS?= no
+.if ${BOOTSTRAP_SETUPTOOLS} == "yes"
+BUILD_DEPENDS+=                ${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
+do-build: ensurepip
+.PHONY: ensurepip
+
+ensurepip:
+       ${SETENV} ${MAKE_ENV} ${PYTHONBIN} -m ensurepip --user
+.else
 DEPENDS+=      ${PYPKGPREFIX}-setuptools>=0.8:../../devel/py-setuptools
+.endif
 
 INSTALLATION_DIRS+=    ${PYSITELIB}