diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-10-01 18:10:15 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-10-01 18:10:15 +0000 |
| commit | a2ae90a7de82f1e46b60a77e6e201927abd5fe3c (patch) | |
| tree | fb0d1f914a382cae495dbb98291f3c7d329b0162 /dev-util/cmake/files | |
| parent | ia64/sparc stable wrt #279386 (diff) | |
| download | gentoo-2-a2ae90a7de82f1e46b60a77e6e201927abd5fe3c.tar.gz gentoo-2-a2ae90a7de82f1e46b60a77e6e201927abd5fe3c.tar.bz2 gentoo-2-a2ae90a7de82f1e46b60a77e6e201927abd5fe3c.zip | |
FindPythonLibs.cmake should use currently active Python version (bug #287143). Remove no longer needed "python3" USE flag.
(Portage version: 14469-svn/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/cmake/files')
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonLibs.patch | 17 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-python-3.patch | 22 |
2 files changed, 4 insertions, 35 deletions
diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch index 7981140296da..d7f4f627be4c 100644 --- a/dev-util/cmake/files/cmake-FindPythonLibs.patch +++ b/dev-util/cmake/files/cmake-FindPythonLibs.patch @@ -1,22 +1,13 @@ --- Modules/FindPythonLibs.cmake +++ Modules/FindPythonLibs.cmake -@@ -13,7 +13,7 @@ +@@ -14,7 +14,9 @@ # Search for the python framework on Apple. CMAKE_FIND_FRAMEWORKS(Python) -FOREACH(_CURRENT_VERSION 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) ++EXECUTE_PROCESS(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" ++ OUTPUT_VARIABLE _PYTHON_VERSION) ++FOREACH(_CURRENT_VERSION ${_PYTHON_VERSION}) STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) IF(WIN32) FIND_LIBRARY(PYTHON_DEBUG_LIBRARY -@@ -27,10 +27,6 @@ - NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]/libs -- PATH_SUFFIXES -- python${_CURRENT_VERSION}/config -- # Avoid finding the .dll in the PATH. We want the .lib. -- NO_SYSTEM_ENVIRONMENT_PATH - ) - - SET(PYTHON_FRAMEWORK_INCLUDES) diff --git a/dev-util/cmake/files/cmake-python-3.patch b/dev-util/cmake/files/cmake-python-3.patch deleted file mode 100644 index 0fdcd0ca1922..000000000000 --- a/dev-util/cmake/files/cmake-python-3.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- Modules/FindPythonInterp.cmake -+++ Modules/FindPythonInterp.cmake -@@ -7,7 +7,7 @@ - # - - FIND_PROGRAM(PYTHON_EXECUTABLE -- NAMES python python2.7 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 -+ 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 - PATHS - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.6\\InstallPath] - [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.5\\InstallPath] ---- Modules/FindPythonLibs.cmake -+++ Modules/FindPythonLibs.cmake -@@ -13,7 +13,7 @@ - # Search for the python framework on Apple. - CMAKE_FIND_FRAMEWORKS(Python) - --FOREACH(_CURRENT_VERSION 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0 1.6 1.5) -+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) - STRING(REPLACE "." "" _CURRENT_VERSION_NO_DOTS ${_CURRENT_VERSION}) - IF(WIN32) - FIND_LIBRARY(PYTHON_DEBUG_LIBRARY |