From owner-svn-ports-all@FreeBSD.ORG  Wed Jun 10 09:23:54 2015
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id D707C3A7;
 Wed, 10 Jun 2015 09:23:54 +0000 (UTC)
 (envelope-from makc@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C5998131F;
 Wed, 10 Jun 2015 09:23:54 +0000 (UTC)
 (envelope-from makc@FreeBSD.org)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t5A9NstG088439;
 Wed, 10 Jun 2015 09:23:54 GMT (envelope-from makc@FreeBSD.org)
Received: (from makc@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id t5A9NsZC088438;
 Wed, 10 Jun 2015 09:23:54 GMT (envelope-from makc@FreeBSD.org)
Message-Id: <201506100923.t5A9NsZC088438@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: makc set sender to makc@FreeBSD.org
 using -f
From: Max Brazhnikov <makc@FreeBSD.org>
Date: Wed, 10 Jun 2015 09:23:54 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r389024 - head/Mk/Uses
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 10 Jun 2015 09:23:55 -0000

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