svn commit: r519142 - in head/net/ceph14: . files

[Dima Panov]

Author: fluffy
Date: Fri Dec  6 13:50:33 2019
New Revision: 519142
URL: https://svnweb.freebsd.org/changeset/ports/519142

Log:
  net/ceph14: allow to build with py36+, indeed.
  
  No PORTREVISION bump, port was always unable to build for py3[78]
  
  PR:		242071
  Submitted by:	fluffy
  Approved by:	maintainer (timeout, >2 weeks)

Added:
  head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake   (contents, props changed)
  head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake   (contents, props changed)
Modified:
  head/net/ceph14/Makefile

Modified: head/net/ceph14/Makefile
==============================================================================
--- head/net/ceph14/Makefile	Fri Dec  6 13:28:49 2019	(r519141)
+++ head/net/ceph14/Makefile	Fri Dec  6 13:50:33 2019	(r519142)
@@ -79,7 +79,7 @@ CMAKE_OFF=	WITH_BOOST_CONTEXT WITH_LTTNG WITH_BABELTRA
 		WITH_SPDK WITH_RDMA WITH_LIBCEPHFS WITH_CEPHFS WITH_RADOSGW_BEAST_FRONTEND \
 		WITH_MGR_DASHBOARD_FRONTEND
 CMAKE_ARGS=	\
-		-D WITH_PYTHON2=OFF -D WITH_PYTHON3=ON -DMGR_PYTHON_VERSION=3.6 \
+		-D WITH_PYTHON2=OFF -D WITH_PYTHON3=ON -DMGR_PYTHON_VERSION=${PYTHON_VER} \
 		-D CEPH_MAN_DIR:STRING=man
 
 SHEBANG_FILES=	src/rbdmap src/ceph-post-file.in src/rbd-replay-many \

Added: head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake	Fri Dec  6 13:50:33 2019	(r519142)
@@ -0,0 +1,11 @@
+--- cmake/modules/FindPython3Interp.cmake.orig	2019-09-13 18:07:41 UTC
++++ cmake/modules/FindPython3Interp.cmake
+@@ -69,7 +69,7 @@
+ 
+ unset(_Python3_NAMES)
+ 
+-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(Python3Interp_FIND_VERSION)
+     if(Python3Interp_FIND_VERSION_COUNT GREATER 1)

Added: head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake	Fri Dec  6 13:50:33 2019	(r519142)
@@ -0,0 +1,11 @@
+--- cmake/modules/FindPython3Libs.cmake.orig	2019-09-13 18:07:41 UTC
++++ cmake/modules/FindPython3Libs.cmake
+@@ -101,7 +101,7 @@ endif()
+ # To avoid picking up the system Python.h pre-maturely.
+ set(CMAKE_FIND_FRAMEWORK LAST)
+ 
+-set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ 
+ if(Python3Libs_FIND_VERSION)
+     if(Python3Libs_FIND_VERSION_COUNT GREATER 1)