| 1 |
arfrever 09/07/24 15:52:53 |
| 2 |
|
| 3 |
Modified: cmake-FindPythonInterp.patch |
| 4 |
cmake-FindPythonLibs.patch |
| 5 |
Log: |
| 6 |
Support more Python versions. |
| 7 |
(Portage version: 13850-svn/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.2 dev-util/cmake/files/cmake-FindPythonInterp.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonInterp.patch?rev=1.2&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonInterp.patch?rev=1.2&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonInterp.patch?r1=1.1&r2=1.2 |
| 15 |
|
| 16 |
Index: cmake-FindPythonInterp.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/files/cmake-FindPythonInterp.patch,v |
| 19 |
retrieving revision 1.1 |
| 20 |
retrieving revision 1.2 |
| 21 |
diff -u -r1.1 -r1.2 |
| 22 |
--- cmake-FindPythonInterp.patch 3 Jan 2009 22:05:13 -0000 1.1 |
| 23 |
+++ cmake-FindPythonInterp.patch 24 Jul 2009 15:52:53 -0000 1.2 |
| 24 |
@@ -1,12 +1,11 @@ |
| 25 |
-diff -ur cmake-2.6.2.orig/Modules/FindPythonInterp.cmake cmake-2.6.2/Modules/FindPythonInterp.cmake |
| 26 |
---- cmake-2.6.2.orig/Modules/FindPythonInterp.cmake 2008-09-24 20:34:34.000000000 +0200 |
| 27 |
-+++ cmake-2.6.2/Modules/FindPythonInterp.cmake 2009-01-03 19:54:21.000000000 +0100 |
| 28 |
+--- Modules/FindPythonInterp.cmake |
| 29 |
++++ Modules/FindPythonInterp.cmake |
| 30 |
@@ -7,7 +7,7 @@ |
| 31 |
# |
| 32 |
|
| 33 |
FIND_PROGRAM(PYTHON_EXECUTABLE |
| 34 |
- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python |
| 35 |
-+ NAMES python python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 |
| 36 |
++ NAMES python python3.2 python3.1 python3.0 python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 |
| 37 |
PATHS |
| 38 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] |
| 39 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] |
| 40 |
|
| 41 |
|
| 42 |
|
| 43 |
1.2 dev-util/cmake/files/cmake-FindPythonLibs.patch |
| 44 |
|
| 45 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?rev=1.2&view=markup |
| 46 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?rev=1.2&content-type=text/plain |
| 47 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?r1=1.1&r2=1.2 |
| 48 |
|
| 49 |
Index: cmake-FindPythonLibs.patch |
| 50 |
=================================================================== |
| 51 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch,v |
| 52 |
retrieving revision 1.1 |
| 53 |
retrieving revision 1.2 |
| 54 |
diff -u -r1.1 -r1.2 |
| 55 |
--- cmake-FindPythonLibs.patch 8 May 2008 15:53:11 -0000 1.1 |
| 56 |
+++ cmake-FindPythonLibs.patch 24 Jul 2009 15:52:53 -0000 1.2 |
| 57 |
@@ -1,5 +1,14 @@ |
| 58 |
---- Modules/FindPythonLibs.cmake 2008-05-08 11:18:22.000000000 -0400 |
| 59 |
-+++ Modules/FindPythonLibs.cmake 2008-05-08 11:18:40.000000000 -0400 |
| 60 |
+--- Modules/FindPythonLibs.cmake |
| 61 |
++++ Modules/FindPythonLibs.cmake |
| 62 |
+@@ -13,7 +13,7 @@ |
| 63 |
+ # Search for the python framework on Apple. |
| 64 |
+ CMAKE_FIND_FRAMEWORKS(Python) |
| 65 |
+ |
| 66 |
+-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
| 67 |
++FOREACH(_CURRENT_VERSION 3.2 3.1 3.0 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
| 68 |
+ STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) |
| 69 |
+ IF(WIN32) |
| 70 |
+ FIND_LIBRARY(PYTHON_DEBUG_LIBRARY |
| 71 |
@@ -27,10 +27,6 @@ |
| 72 |
NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} |
| 73 |
PATHS |
Archives