pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/lang/python Always give full interpreter path to cmake.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/465c9d064143
branches:  trunk
changeset: 314133:465c9d064143
user:      bsiegert <bsiegert%pkgsrc.org@localhost>
date:      Fri Oct 19 16:12:36 2018 +0000

description:
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.

diffstat:

 lang/python/pyversion.mk |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (23 lines):

diff -r 7884afaaa935 -r 465c9d064143 lang/python/pyversion.mk
--- a/lang/python/pyversion.mk  Fri Oct 19 15:53:50 2018 +0000
+++ b/lang/python/pyversion.mk  Fri Oct 19 16:12:36 2018 +0000
@@ -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 @@
 # 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



Home | Main Index | Thread Index | Old Index