Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 24 Dec 2020 13:33:23 +0000 (UTC)
From:      Dima Panov <fluffy@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r559086 - in head/net/ceph14: . files
Message-ID:  <202012241333.0BODXN6Z017784@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: fluffy
Date: Thu Dec 24 13:33:22 2020
New Revision: 559086
URL: https://svnweb.freebsd.org/changeset/ports/559086

Log:
  net/ceph14: switch to PYTHON_EXT_SUFFIX
  
  Allow to build with python39
  Use binary_alias for sphinx-build

Modified:
  head/net/ceph14/Makefile
  head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake
  head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake

Modified: head/net/ceph14/Makefile
==============================================================================
--- head/net/ceph14/Makefile	Thu Dec 24 13:30:35 2020	(r559085)
+++ head/net/ceph14/Makefile	Thu Dec 24 13:33:22 2020	(r559086)
@@ -4,7 +4,7 @@
 PORTNAME=	ceph
 DISTVERSIONPREFIX=	v
 DISTVERSION=	14.2.11
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net
 PKGNAMESUFFIX=	14
 
@@ -62,7 +62,7 @@ RUN_DEPENDS=	\
 	${PYTHON_PKGNAMEPREFIX}requests>=0:www/py-requests@${PY_FLAVOR} \
 	${PYTHON_PKGNAMEPREFIX}routes>=0:www/py-routes@${PY_FLAVOR}
 
-USES=		cmake:noninja dos2unix fuse gettext-runtime gmake ncurses \
+USES=		cmake:noninja compiler:c++17-lang dos2unix fuse gettext-runtime gmake ncurses \
 		pkgconfig python:3.7+ shebangfix ssl
 USE_PYTHON=	cython py3kplist
 USE_OPENLDAP=	yes
@@ -106,6 +106,8 @@ USE_LDCONFIG=	yes
 
 USERS=		ceph
 GROUPS=		ceph
+
+BINARY_ALIAS=	sphinx-build=sphinx-build-${PYTHON_VER}
 
 # PLIST_SUB=CMAKE_BUILD_TYPE_regex="\bdebug\b"
 

Modified: head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake
==============================================================================
--- head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake	Thu Dec 24 13:30:35 2020	(r559085)
+++ head/net/ceph14/files/patch-cmake_modules_FindPython3Interp.cmake	Thu Dec 24 13:33:22 2020	(r559086)
@@ -5,7 +5,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)
++set(_PYTHON3_VERSIONS 3.9 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)

Modified: head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake
==============================================================================
--- head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake	Thu Dec 24 13:30:35 2020	(r559085)
+++ head/net/ceph14/files/patch-cmake_modules_FindPython3Libs.cmake	Thu Dec 24 13:33:22 2020	(r559086)
@@ -5,7 +5,7 @@
  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)
++set(_PYTHON3_VERSIONS 3.9 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)



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202012241333.0BODXN6Z017784>