Attachment 219375 Details for Bug 250884 – v3

[patch] v3

py39-cantor.v3.diff (text/plain), 2.14 KB, created by Tobias C. Berner on 2020-11-05 18:26:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Tobias C. Berner

Created: 2020-11-05 18:26:25 UTC

Size: 2.14 KB

patch

obsolete

>Index: math/cantor/Makefile
>===================================================================
>--- math/cantor/Makefile	(revision 554146)
>+++ math/cantor/Makefile	(working copy)
>@@ -58,8 +58,7 @@
> post-patch:
> 	${REINPLACE_CMD} -e '/FIND_PROGRAM(_GFORTRAN_EXECUTABLE/s,gfortran,${FC},' \
> 		${WRKSRC}/cmake/FindR.cmake
>-	${REINPLACE_CMD} -e '/find_library(PYTHONLIBS3_LIBRARY/s,python3.5m,python3.5m python3.6m,' \
>-			 -e '/pkg_check_modules/s,python3,python-${PYTHON_VER},' \
>+	${REINPLACE_CMD} -e 's|%%PYTHON_VERSION%%|${PYTHON_VERSION}|g' \
> 		${WRKSRC}/cmake/FindPythonLibs3.cmake
> 
> .include <bsd.port.mk>
>Index: math/cantor/files/patch-cmake_FindPythonLibs3.cmake
>===================================================================
>--- math/cantor/files/patch-cmake_FindPythonLibs3.cmake	(nonexistent)
>+++ math/cantor/files/patch-cmake_FindPythonLibs3.cmake	(working copy)
>@@ -0,0 +1,18 @@
>+--- cmake/FindPythonLibs3.cmake.orig	2020-10-31 16:59:49 UTC
>++++ cmake/FindPythonLibs3.cmake
>+@@ -1,5 +1,5 @@
>+ find_package(PkgConfig)
>+-pkg_check_modules(PYTHONLIBS3 QUIET python3)
>++pkg_check_modules(PYTHONLIBS3 QUIET %%PYTHON_VERSION%%)
>+ set(PYTHONLIBS3_DEFINITIONS ${PYTHONLIBS3_CFLAGS_OTHER})
>+ 
>+ find_path(PYTHONLIBS3_INCLUDE_DIR Python.h
>+@@ -9,7 +9,7 @@ IF(WIN32)
>+   find_library(PYTHONLIBS3_LIBRARY NAMES python32 python33 python34 python35 python36 python37 python38
>+                HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
>+ ELSE()
>+-  find_library(PYTHONLIBS3_LIBRARY NAMES python3.2m python3.3m python3.4m python3.5m python3.6m python3.7m python3.8
>++  find_library(PYTHONLIBS3_LIBRARY NAMES %%PYTHON_VERSION%% python3.7 python3.2m python3.3m python3.4m python3.5m python3.6m python3.7m python3.8
>+                HINTS ${PYTHONLIBS3_LIBDIR} ${PYTHONLIBS3_LIBRARY_DIRS} )
>+ ENDIF()
>+ 
>
>Property changes on: math/cantor/files/patch-cmake_FindPythonLibs3.cmake
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 250884: 219373 | 219374 | 219375 | 219377