Attachment 192545 Details for Bug 227428 – workaround

[patch] workaround

cmake-boost-python-version.diff (text/plain), 2.89 KB, created by Jan Beich on 2018-04-16 05:54:45 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2018-04-16 05:54:45 UTC

Size: 2.89 KB

patch

obsolete

>From 6543f4f14f1718466d36c407c368edb84d4431fb Mon Sep 17 00:00:00 2001
>From: Jan Beich <jbeich@FreeBSD.org>
>Date: Mon, 16 Apr 2018 05:32:59 +0000
>Subject: [PATCH] devel/cmake: allow consumers to qualify boost_python version
>
>PR:		227428
>Approved by:	kde (???)
>---
> Mk/Uses/python.mk                             |  1 +
> devel/cmake/Makefile                          |  1 +
> .../cmake/files/patch-Modules_FindBoost.cmake | 23 +++++++++++++++++++
> 3 files changed, 25 insertions(+)
> create mode 100644 devel/cmake/files/patch-Modules_FindBoost.cmake
>
>diff --git a/Mk/Uses/python.mk b/Mk/Uses/python.mk
>index ae78279def26..c169c18ad633 100644
>--- a/Mk/Uses/python.mk
>+++ b/Mk/Uses/python.mk
>@@ -663,6 +663,7 @@ PY_FUTURES=	${PYTHON_PKGNAMEPREFIX}futures>0:devel/py-futures@${PY_FLAVOR}
> 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}
> 
>diff --git a/devel/cmake/Makefile b/devel/cmake/Makefile
>index 7d9a27f83e3b..eed6b05b7fc0 100644
>--- a/devel/cmake/Makefile
>+++ b/devel/cmake/Makefile
>@@ -4,6 +4,7 @@
> PORTNAME=	cmake
> # Remember to update devel/cmake-doc and devel/cmake-gui as well.
> DISTVERSION=	3.11.0
>+PORTREVISION=	1
> CATEGORIES=	devel
> MASTER_SITES=	https://www.cmake.org/files/v${PORTVERSION:R}/
> 
>diff --git a/devel/cmake/files/patch-Modules_FindBoost.cmake b/devel/cmake/files/patch-Modules_FindBoost.cmake
>new file mode 100644
>index 000000000000..a58d486447cb
>--- /dev/null
>+++ b/devel/cmake/files/patch-Modules_FindBoost.cmake
>@@ -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. <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}")

Flags:

jbeich: maintainer-approval? (kde)

Actions: View | Diff

Attachments on bug 227428: 192545