From owner-svn-ports-head@freebsd.org Wed Apr 18 13:58:17 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id EC27EF8CEC6; Wed, 18 Apr 2018 13:58:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 939BB7383B; Wed, 18 Apr 2018 13:58:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 764EC1BD1D; Wed, 18 Apr 2018 13:58:16 +0000 (UTC) (envelope-from jbeich@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w3IDwGsT088615; Wed, 18 Apr 2018 13:58:16 GMT (envelope-from jbeich@FreeBSD.org) Received: (from jbeich@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w3IDwGVg088612; Wed, 18 Apr 2018 13:58:16 GMT (envelope-from jbeich@FreeBSD.org) Message-Id: <201804181358.w3IDwGVg088612@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jbeich set sender to jbeich@FreeBSD.org using -f From: Jan Beich Date: Wed, 18 Apr 2018 13:58:16 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r467712 - in head: Mk/Uses devel/cmake devel/cmake/files X-SVN-Group: ports-head X-SVN-Commit-Author: jbeich X-SVN-Commit-Paths: in head: Mk/Uses devel/cmake devel/cmake/files X-SVN-Commit-Revision: 467712 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 18 Apr 2018 13:58:17 -0000 Author: jbeich Date: Wed Apr 18 13:58:15 2018 New Revision: 467712 URL: https://svnweb.freebsd.org/changeset/ports/467712 Log: devel/cmake: allow consumers to qualify boost_python version PR: 227428 Exp-run by: antoine Added: head/devel/cmake/files/patch-Modules_FindBoost.cmake (contents, props changed) Modified: head/Mk/Uses/python.mk (contents, props changed) head/devel/cmake/Makefile (contents, props changed) Modified: head/Mk/Uses/python.mk ============================================================================== --- head/Mk/Uses/python.mk Wed Apr 18 13:57:42 2018 (r467711) +++ head/Mk/Uses/python.mk Wed Apr 18 13:58:15 2018 (r467712) @@ -663,6 +663,7 @@ PY_FUTURES= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py- PY_FUTURES= .endif +CMAKE_ARGS+= -DBOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX} PY_BOOST_LIB= boost_python${PYTHON_SUFFIX} PY_BOOST= lib${PY_BOOST_LIB}.so:devel/boost-python-libs@${PY_FLAVOR} Modified: head/devel/cmake/Makefile ============================================================================== --- head/devel/cmake/Makefile Wed Apr 18 13:57:42 2018 (r467711) +++ head/devel/cmake/Makefile Wed Apr 18 13:58:15 2018 (r467712) @@ -4,7 +4,7 @@ PORTNAME= cmake # Remember to update devel/cmake-doc and devel/cmake-gui as well. DISTVERSION= 3.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= devel MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/ Added: head/devel/cmake/files/patch-Modules_FindBoost.cmake ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/cmake/files/patch-Modules_FindBoost.cmake Wed Apr 18 13:58:15 2018 (r467712) @@ -0,0 +1,23 @@ +--- Modules/FindBoost.cmake.orig 2018-03-28 11:16:49 UTC ++++ Modules/FindBoost.cmake +@@ -55,6 +55,7 @@ + # (or BOOSTROOT) + # BOOST_INCLUDEDIR - Preferred include directory e.g. /include + # BOOST_LIBRARYDIR - Preferred library directory e.g. /lib ++# BOOST_PYTHON_SUFFIX - Preferred Python version + # Boost_NO_SYSTEM_PATHS - Set to ON to disable searching in locations not + # specified by these hint variables. Default is OFF. + # Boost_ADDITIONAL_VERSIONS +@@ -1663,10 +1664,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS}) + # Handle Python version suffixes + unset(COMPONENT_PYTHON_VERSION_MAJOR) + unset(COMPONENT_PYTHON_VERSION_MINOR) +- if(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\$") ++ if(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\$") + set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") + set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") +- elseif(${COMPONENT} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") ++ elseif(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python|mpi_python|numpy)([0-9])\\.?([0-9])\$") + set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}") + set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}") + set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}")