Attachment 7107 Details for Bug 16926 – Alternate patch to add Python 3.5 detection support to CMake 3.3.2

[patch] Alternate patch to add Python 3.5 detection support to CMake 3.3.2

file_16926.txt (text/plain), 1.30 KB, created by Neal Gompa on 2015-10-09 15:05:39 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Neal Gompa

Created: 2015-10-09 15:05:39 CEST

Size: 1.30 KB

patch

obsolete

>Index: SOURCES/cmake-python3.5.patch
>===================================================================
>--- SOURCES/cmake-python3.5.patch	(revision 0)
>+++ SOURCES/cmake-python3.5.patch	(working copy)
>@@ -0,0 +1,12 @@
>+diff -up cmake-3.3.2/Modules/FindPythonLibs.cmake.orig cmake-3.3.2/Modules/FindPythonLibs.cmake
>+--- cmake-3.3.2/Modules/FindPythonLibs.cmake.orig	2015-09-16 10:53:05.000000000 -0600
>++++ cmake-3.3.2/Modules/FindPythonLibs.cmake	2015-10-06 08:14:58.323564067 -0600
>+@@ -55,7 +55,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
>+
>+ set(_PYTHON1_VERSIONS 1.6 1.5)
>+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
>+-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
>++set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
>+
>+ if(PythonLibs_FIND_VERSION)
>+     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
>Index: SPECS/cmake.spec
>===================================================================
>--- SPECS/cmake.spec	(revision 888219)
>+++ SPECS/cmake.spec	(working copy)
>@@ -26,7 +26,9 @@
> Source1:	cmake.macros
> # fix ftlk detection
> Patch1:		0001-Fix-FLTK-Find-path.patch
>-Patch3:     0003-Disable-Test198.patch
>+Patch3: 	0003-Disable-Test198.patch
>+# From Fedora, fix Python 3.5 detection
>+Patch4: 	cmake-python3.5.patch
> BuildRequires:	perl
> BuildRequires:	ncurses-devel
> BuildRequires:	libcurl-devel

Index: SOURCES/cmake-python3.5.patch
===================================================================
--- SOURCES/cmake-python3.5.patch	(revision 0)
+++ SOURCES/cmake-python3.5.patch	(working copy)
@@ -0,0 +1,12 @@
+diff -up cmake-3.3.2/Modules/FindPythonLibs.cmake.orig cmake-3.3.2/Modules/FindPythonLibs.cmake
+--- cmake-3.3.2/Modules/FindPythonLibs.cmake.orig	2015-09-16 10:53:05.000000000 -0600
++++ cmake-3.3.2/Modules/FindPythonLibs.cmake	2015-10-06 08:14:58.323564067 -0600
+@@ -55,7 +55,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
+
+ set(_PYTHON1_VERSIONS 1.6 1.5)
+ set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
+-set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
++set(_PYTHON3_VERSIONS 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+
+ if(PythonLibs_FIND_VERSION)
+     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
Index: SPECS/cmake.spec
===================================================================
--- SPECS/cmake.spec	(revision 888219)
+++ SPECS/cmake.spec	(working copy)
@@ -26,7 +26,9 @@
 Source1:	cmake.macros
 # fix ftlk detection
 Patch1:		0001-Fix-FLTK-Find-path.patch
-Patch3:     0003-Disable-Test198.patch
+Patch3: 	0003-Disable-Test198.patch
+# From Fedora, fix Python 3.5 detection
+Patch4: 	cmake-python3.5.patch
 BuildRequires:	perl
 BuildRequires:	ncurses-devel
 BuildRequires:	libcurl-devel

Actions: View | Diff

Attachments on bug 16926: 7106 | 7107