CVS commit: pkgsrc/lang/python

["Benny Siegert" <bsiegert%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bsiegert
Date:           Fri Oct 19 16:12:36 UTC 2018

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

Log Message:
Always give full interpreter path to cmake.

This was previously Darwin-only but I ran into the same situation when
building finance/gnucash on NetBSD. /usr/pkg/bin/python happened to be
2.7, but it was used instead of python3.7, leading to a build failure.
This commit fixes that.


To generate a diff of this commit:
cvs rdiff -u -r1.125 -r1.126 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.125 pkgsrc/lang/python/pyversion.mk:1.126
--- pkgsrc/lang/python/pyversion.mk:1.125       Sun Oct  7 23:56:23 2018
+++ pkgsrc/lang/python/pyversion.mk     Fri Oct 19 16:12:36 2018
@@ -1,4 +1,4 @@
-# $NetBSD: pyversion.mk,v 1.125 2018/10/07 23:56:23 ryoon Exp $
+# $NetBSD: pyversion.mk,v 1.126 2018/10/19 16:12:36 bsiegert Exp $
 
 # This file determines which Python version is used as a dependency for
 # a package.
@@ -203,9 +203,10 @@ ALL_ENV+=          PYTHON=${PYTHONBIN}
 # used by FindPythonInterp.cmake and FindPythonLibs.cmake
 CMAKE_ARGS+=           -DPYVERSSUFFIX:STRING=${PYVERSSUFFIX}
 # set this explicitly, as by default it will prefer the built in framework
-CMAKE_ARGS.Darwin+=    -DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
-CMAKE_ARGS.Darwin+=    -DPYTHON_INCLUDE_PATH:PATH=${BUILDLINK_DIR}/${PYINC}
-CMAKE_ARGS.Darwin+=    -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
+# on Darwin
+CMAKE_ARGS+=           -DPYTHON_INCLUDE_DIR:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_ARGS+=           -DPYTHON_INCLUDE_PATH:PATH=${BUILDLINK_DIR}/${PYINC}
+CMAKE_ARGS+=           -DPYTHON_EXECUTABLE:FILEPATH=${PYTHONBIN}
 .endif
 
 .endif # PYTHON_PYVERSION_MK