CVS commit: pkgsrc/lang/python

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Sun Oct 10 19:10:41 UTC 2021

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

Log Message:
Set include and lib paths without calling (deprecated) distutils


To generate a diff of this commit:
cvs rdiff -u -r1.138 -r1.139 pkgsrc/lang/python/pyversion.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/pyversion.mk
diff -u pkgsrc/lang/python/pyversion.mk:1.138 pkgsrc/lang/python/pyversion.mk:1.139
--- pkgsrc/lang/python/pyversion.mk:1.138       Tue Oct  5 19:08:13 2021
+++ pkgsrc/lang/python/pyversion.mk     Sun Oct 10 19:10:41 2021
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.138 2021/10/05 19:08:13 adam Exp $
+# $NetBSD: pyversion.mk,v 1.139 2021/10/10 19:10:41 adam Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -188,13 +188,9 @@ PY_COMPILE_ALL= \
 PY_COMPILE_O_ALL= \
        ${PYTHONBIN} -O ${PREFIX}/lib/python${PYVERSSUFFIX}/compileall.py -q
 
-.if exists(${PYTHONBIN})
-PYINC!=        ${PYTHONBIN} -c "import distutils.sysconfig; \
-       print (distutils.sysconfig.get_python_inc(0, \"\"))" || ${ECHO} ""
-PYLIB!=        ${PYTHONBIN} -c "import distutils.sysconfig; \
-       print (distutils.sysconfig.get_python_lib(0, 1, \"\"))" || ${ECHO} ""
-PYSITELIB!=    ${PYTHONBIN} -c "import distutils.sysconfig; \
-       print (distutils.sysconfig.get_python_lib(0, 0, \"\"))" || ${ECHO} ""
+PYINC=         include/python${PYVERSSUFFIX}
+PYLIB=         lib/python${PYVERSSUFFIX}
+PYSITELIB=     ${PYLIB}/site-packages
 
 PRINT_PLIST_AWK+=      /^${PYINC:S|/|\\/|g}/ \
                        { gsub(/${PYINC:S|/|\\/|g}/, "$${PYINC}") }
@@ -202,7 +198,6 @@ PRINT_PLIST_AWK+=   /^${PYSITELIB:S|/|\\/|
                        { gsub(/${PYSITELIB:S|/|\\/|g}/, "$${PYSITELIB}") }
 PRINT_PLIST_AWK+=      /^${PYLIB:S|/|\\/|g}/ \
                        { gsub(/${PYLIB:S|/|\\/|g}/, "$${PYLIB}") }
-.endif
 
 ALL_ENV+=              PYTHON=${PYTHONBIN}
 .if defined(USE_CMAKE)