Date: Wed, 10 Jun 2015 09:23:54 +0000 (UTC) From: Max Brazhnikov <makc@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r389024 - head/Mk/Uses Message-ID: <201506100923.t5A9NsZC088438@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: makc Date: Wed Jun 10 09:23:54 2015 New Revision: 389024 URL: https://svnweb.freebsd.org/changeset/ports/389024 Log: Pass the default Python version (or the version required by port) for CMake based ports. By default CMake picks up the highest available version of Python package, therefore ports which use CMake may fail to build or link to different Python library than one could expect (e.g. bugs 199685, 200518). In essence this commit reverts r366996. PR: 168159 Exp-run by: antoine Approved by: mva Modified: head/Mk/Uses/python.mk Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Wed Jun 10 08:19:20 2015 (r389023) +++ head/Mk/Uses/python.mk Wed Jun 10 09:23:54 2015 (r389024) @@ -521,6 +521,10 @@ add-plist-post: # Fix for programs that build python from a GNU auto* environment CONFIGURE_ENV+= PYTHON="${PYTHON_CMD}" +# By default CMake picks up the highest available version of Python package. +# Enforce the version required by the port or the default. +CMAKE_ARGS+= -DPython_ADDITIONAL_VERSIONS=${PYTHON_VER} + # Python 3rd-party modules PYGAME= ${PYTHON_PKGNAMEPREFIX}game>0:${PORTSDIR}/devel/py-game PYNUMERIC= ${PYTHON_SITELIBDIR}/Numeric/Numeric.py:${PORTSDIR}/math/py-numeric
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506100923.t5A9NsZC088438>