| 1 |
arfrever 09/10/01 18:10:15 |
| 2 |
|
| 3 |
Modified: cmake-FindPythonLibs.patch |
| 4 |
Removed: cmake-python-3.patch |
| 5 |
Log: |
| 6 |
FindPythonLibs.cmake should use currently active Python version (bug #287143). Remove no longer needed "python3" USE flag. |
| 7 |
(Portage version: 14469-svn/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.4 dev-util/cmake/files/cmake-FindPythonLibs.patch |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?rev=1.4&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?rev=1.4&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch?r1=1.3&r2=1.4 |
| 15 |
|
| 16 |
Index: cmake-FindPythonLibs.patch |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/dev-util/cmake/files/cmake-FindPythonLibs.patch,v |
| 19 |
retrieving revision 1.3 |
| 20 |
retrieving revision 1.4 |
| 21 |
diff -u -r1.3 -r1.4 |
| 22 |
--- cmake-FindPythonLibs.patch 28 Jul 2009 16:30:34 -0000 1.3 |
| 23 |
+++ cmake-FindPythonLibs.patch 1 Oct 2009 18:10:15 -0000 1.4 |
| 24 |
@@ -1,22 +1,13 @@ |
| 25 |
--- Modules/FindPythonLibs.cmake |
| 26 |
+++ Modules/FindPythonLibs.cmake |
| 27 |
-@@ -13,7 +13,7 @@ |
| 28 |
+@@ -14,7 +14,9 @@ |
| 29 |
# Search for the python framework on Apple. |
| 30 |
CMAKE_FIND_FRAMEWORKS(Python) |
| 31 |
|
| 32 |
-FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
| 33 |
-+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) |
| 34 |
++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" |
| 35 |
++ OUTPUT_VARIABLE _PYTHON_VERSION) |
| 36 |
++FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION}) |
| 37 |
STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) |
| 38 |
IF(WIN32) |
| 39 |
FIND_LIBRARY(PYTHON_DEBUG_LIBRARY |
| 40 |
-@@ -27,10 +27,6 @@ |
| 41 |
- NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} |
| 42 |
- PATHS |
| 43 |
- [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs |
| 44 |
-- PATH_SUFFIXES |
| 45 |
-- python${_CURRENT_VERSION}/config |
| 46 |
-- # Avoid finding the .dll in the PATH. We want the .lib. |
| 47 |
-- NO_SYSTEM_ENVIRONMENT_PATH |
| 48 |
- ) |
| 49 |
- |
| 50 |
- SET(PYTHON_FRAMEWORK_INCLUDES) |
Archives