Attachment #192545 for bug #227428

View | Details | Raw Unified | Return to bug 227428
Collapse All | Expand All

Lines 663-668 PY_FUTURES= ${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${PY_FLAVOR} Link Here

(-)b/Mk/Uses/python.mk (+1 lines)
663	PY_FUTURES=	663	PY_FUTURES=
664	.endif	664	.endif
665		665
		666	CMAKE_ARGS+= -DBOOST_PYTHON_SUFFIX:STRING=${PYTHON_SUFFIX}
666	PY_BOOST_LIB= boost_python${PYTHON_SUFFIX}	667	PY_BOOST_LIB= boost_python${PYTHON_SUFFIX}
667	PY_BOOST= lib${PY_BOOST_LIB}.so:devel/boost-python-libs@${PY_FLAVOR}	668	PY_BOOST= lib${PY_BOOST_LIB}.so:devel/boost-python-libs@${PY_FLAVOR}
668		669

Lines 4-9 Link Here

(-)b/devel/cmake/Makefile (+1 lines)
4	PORTNAME= cmake	4	PORTNAME= cmake
5	# Remember to update devel/cmake-doc and devel/cmake-gui as well.	5	# Remember to update devel/cmake-doc and devel/cmake-gui as well.
6	DISTVERSION= 3.11.0	6	DISTVERSION= 3.11.0
		7	PORTREVISION= 1
7	CATEGORIES= devel	8	CATEGORIES= devel
8	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/	9	MASTER_SITES= https://www.cmake.org/files/v${PORTVERSION:R}/
9		10




--- 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. <prefix>/include
 #   BOOST_LIBRARYDIR       - Preferred library directory e.g. <prefix>/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}")

Return to bug 227428

Added Link Here

(-)b/devel/cmake/files/patch-Modules_FindBoost.cmake (+23 lines)
1	--- Modules/FindBoost.cmake.orig 2018-03-28 11:16:49 UTC
2	+++ Modules/FindBoost.cmake
3	@@ -55,6 +55,7 @@
4	# (or BOOSTROOT)
5	# BOOST_INCLUDEDIR - Preferred include directory e.g. <prefix>/include
6	# BOOST_LIBRARYDIR - Preferred library directory e.g. <prefix>/lib
7	+# BOOST_PYTHON_SUFFIX - Preferred Python version
8	# Boost_NO_SYSTEM_PATHS - Set to ON to disable searching in locations not
9	# specified by these hint variables. Default is OFF.
10	# Boost_ADDITIONAL_VERSIONS
11	@@ -1663,10 +1664,10 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
12	# Handle Python version suffixes
13	unset(COMPONENT_PYTHON_VERSION_MAJOR)
14	unset(COMPONENT_PYTHON_VERSION_MINOR)
15	- if(${COMPONENT} MATCHES "^(python\|mpi_python\|numpy)([0-9])\$")
16	+ if(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python\|mpi_python\|numpy)([0-9])\$")
17	set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
18	set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
19	- elseif(${COMPONENT} MATCHES "^(python\|mpi_python\|numpy)([0-9])\\.?([0-9])\$")
20	+ elseif(${COMPONENT}${BOOST_PYTHON_SUFFIX} MATCHES "^(python\|mpi_python\|numpy)([0-9])\\.?([0-9])\$")
21	set(COMPONENT_UNVERSIONED "${CMAKE_MATCH_1}")
22	set(COMPONENT_PYTHON_VERSION_MAJOR "${CMAKE_MATCH_2}")
23	set(COMPONENT_PYTHON_VERSION_MINOR "${CMAKE_MATCH_3}")