Attachment 217033 Details for Bug 248488 – [patch] allow cmake to look for a specific python version

[patch] [patch] allow cmake to look for a specific python version

pr-248488-specify-pyver.diff (text/plain), 1.78 KB, created by John Hein on 2020-08-05 18:17:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Hein

Created: 2020-08-05 18:17:49 UTC

Size: 1.78 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 544235)
>+++ Makefile	(working copy)
>@@ -57,6 +57,7 @@
> CMAKE_ARGS+=	-DLLVM_ENABLE_Z3_SOLVER=OFF
> CMAKE_ARGS+=	-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
> 		-DPYTHON_INCLUDE_DIR=${PYTHON_INCLUDEDIR} \
>+		-DEXACT_PYTHON_VERSION=${PYTHON_VER} \
> 		-DPYTHON_LIBRARY=${LOCALBASE}/lib/lib${PYTHON_VERSION}${PYTHON_ABIVER}.so
> 
> # Disable assertions.  They should be disabled by cmake, but USES=cmake
>Index: files/patch-CMakeLists.txt
>===================================================================
>--- files/patch-CMakeLists.txt	(nonexistent)
>+++ files/patch-CMakeLists.txt	(working copy)
>@@ -0,0 +1,19 @@
>+Until cmake upstream issue resolved [1], patch CMakeLists.txt to heed ${PYTHON_VER}
>+
>+https://gitlab.kitware.com/cmake/cmake/-/issues/19492
>+
>+--- CMakeLists.txt.orig	2020-07-28 05:47:17 UTC
>++++ CMakeLists.txt
>+@@ -697,7 +697,11 @@ if(CMAKE_VERSION VERSION_LESS 3.12)
>+     IMPORTED_LOCATION ${PYTHON_EXECUTABLE})
>+   set(Python3_EXECUTABLE ${PYTHON_EXECUTABLE})
>+ else()
>+-  find_package(Python3 COMPONENTS Interpreter)
>++  if(EXACT_PYTHON_VERSION)
>++    find_package(Python3 ${EXACT_PYTHON_VERSION} EXACT COMPONENTS Interpreter)
>++  else()
>++    find_package(Python3 COMPONENTS Interpreter)
>++  endif()
>+   if(NOT Python3_Interpreter_FOUND)
>+     message(WARNING "Python3 not found, using python2 as a fallback")
>+     find_package(Python2 COMPONENTS Interpreter REQUIRED)
>
>Property changes on: files/patch-CMakeLists.txt
>___________________________________________________________________
>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 248488: 217033 | 217040