1 |
arfrever 09/07/28 16:30:34 |
2 |
|
3 |
Modified: cmake-FindPythonInterp.patch |
4 |
cmake-FindPythonLibs.patch |
5 |
Added: cmake-python-3.patch |
6 |
Log: |
7 |
Add "python3" USE flag. |
8 |
(Portage version: 13851-svn/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.3 dev-util/cmake/files/cmake-FindPythonInterp.patch |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonInterp.patch?rev=1.3&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonInterp.patch?rev=1.3&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonInterp.patch?r1=1.2&r2=1.3 |
16 |
|
17 |
Index: cmake-FindPythonInterp.patch |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/files/cmake-FindPythonInterp.patch,v |
20 |
retrieving revision 1.2 |
21 |
retrieving revision 1.3 |
22 |
diff -u -r1.2 -r1.3 |
23 |
--- cmake-FindPythonInterp.patch 24 Jul 2009 15:52:53 -0000 1.2 |
24 |
+++ cmake-FindPythonInterp.patch 28 Jul 2009 16:30:34 -0000 1.3 |
25 |
@@ -5,7 +5,7 @@ |
26 |
|
27 |
FIND_PROGRAM(PYTHON_EXECUTABLE |
28 |
- NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python |
29 |
-+ 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 |
30 |
++ NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 |
31 |
PATHS |
32 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] |
33 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] |
34 |
|
35 |
|
36 |
|
37 |
1.3 dev-util/cmake/files/cmake-FindPythonLibs.patch |
38 |
|
39 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?rev=1.3&view=markup |
40 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?rev=1.3&content-type=text/plain |
41 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?r1=1.2&r2=1.3 |
42 |
|
43 |
Index: cmake-FindPythonLibs.patch |
44 |
=================================================================== |
45 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch,v |
46 |
retrieving revision 1.2 |
47 |
retrieving revision 1.3 |
48 |
diff -u -r1.2 -r1.3 |
49 |
--- cmake-FindPythonLibs.patch 24 Jul 2009 15:52:53 -0000 1.2 |
50 |
+++ cmake-FindPythonLibs.patch 28 Jul 2009 16:30:34 -0000 1.3 |
51 |
@@ -5,7 +5,7 @@ |
52 |
CMAKE_FIND_FRAMEWORKS(Python) |
53 |
|
54 |
-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
55 |
-+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) |
56 |
++FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
57 |
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) |
58 |
IF(WIN32) |
59 |
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY |
60 |
|
61 |
|
62 |
|
63 |
1.1 dev-util/cmake/files/cmake-python-3.patch |
64 |
|
65 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-python-3.patch?rev=1.1&view=markup |
66 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-python-3.patch?rev=1.1&content-type=text/plain |
67 |
|
68 |
Index: cmake-python-3.patch |
69 |
=================================================================== |
70 |
--- Modules/FindPythonInterp.cmake |
71 |
+++ Modules/FindPythonInterp.cmake |
72 |
@@ -7,7 +7,7 @@ |
73 |
# |
74 |
|
75 |
FIND_PROGRAM(PYTHON_EXECUTABLE |
76 |
- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 |
77 |
+ 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 |
78 |
PATHS |
79 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] |
80 |
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] |
81 |
--- Modules/FindPythonLibs.cmake |
82 |
+++ Modules/FindPythonLibs.cmake |
83 |
@@ -13,7 +13,7 @@ |
84 |
# Search for the python framework on Apple. |
85 |
CMAKE_FIND_FRAMEWORKS(Python) |
86 |
|
87 |
-FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
88 |
+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) |
89 |
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) |
90 |
IF(WIN32) |
91 |
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY |