diff options
| author |   Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-24 15:52:53 +0000 |
|---|---|---|
| committer | Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> | 2009-07-24 15:52:53 +0000 |
| commit | 11e63110e322ab8392a3bc033f6a6adc0c5932f2 (patch) | |
| tree | 704e289495f3a216f86c5881c743f472a8bc1634 | |
| parent | Fix RDEPEND, some dependencies was missing. Drop ${MY_PV}, Increase eapi to 2... (diff) | |
| download | gentoo-2-11e63110e322ab8392a3bc033f6a6adc0c5932f2.tar.gz gentoo-2-11e63110e322ab8392a3bc033f6a6adc0c5932f2.tar.bz2 gentoo-2-11e63110e322ab8392a3bc033f6a6adc0c5932f2.zip | |
Support more Python versions.
(Portage version: 13850-svn/cvs/Linux x86_64)
| -rw-r--r-- | dev-util/cmake/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonInterp.patch | 7 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-FindPythonLibs.patch | 13 |
3 files changed, 19 insertions, 7 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 8edb4ec06e4d..121b895352bb 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.103 2009/07/17 19:08:42 arfrever Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.104 2009/07/24 15:52:52 arfrever Exp $ + + 24 Jul 2009; Arfrever Frehtes Taifersar Arahesis <arfrever@gentoo.org> + files/cmake-FindPythonInterp.patch, files/cmake-FindPythonLibs.patch: + Support more Python versions. *cmake-2.6.4-r1 (17 Jul 2009) diff --git a/dev-util/cmake/files/cmake-FindPythonInterp.patch b/dev-util/cmake/files/cmake-FindPythonInterp.patch index f70d4f83d357..91ecc6fe5a5e 100644 --- a/dev-util/cmake/files/cmake-FindPythonInterp.patch +++ b/dev-util/cmake/files/cmake-FindPythonInterp.patch @@ -1,12 +1,11 @@ -diff -ur cmake-2.6.2.orig/Modules/FindPythonInterp.cmake cmake-2.6.2/Modules/FindPythonInterp.cmake ---- cmake-2.6.2.orig/Modules/FindPythonInterp.cmake 2008-09-24 20:34:34.000000000 +0200 -+++ cmake-2.6.2/Modules/FindPythonInterp.cmake 2009-01-03 19:54:21.000000000 +0100 +--- Modules/FindPythonInterp.cmake ++++ Modules/FindPythonInterp.cmake @@ -7,7 +7,7 @@ # FIND_PROGRAM(PYTHON_EXECUTABLE - NAMES python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 python -+ NAMES python 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.5\\InstallPath] [HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\2.4\\InstallPath] diff --git a/dev-util/cmake/files/cmake-FindPythonLibs.patch b/dev-util/cmake/files/cmake-FindPythonLibs.patch index f473cffd9d18..433ba31c5a70 100644 --- a/dev-util/cmake/files/cmake-FindPythonLibs.patch +++ b/dev-util/cmake/files/cmake-FindPythonLibs.patch @@ -1,5 +1,14 @@ ---- Modules/FindPythonLibs.cmake 2008-05-08 11:18:22.000000000 -0400 -+++ Modules/FindPythonLibs.cmake 2008-05-08 11:18:40.000000000 -0400 +--- 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.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 @@ -27,10 +27,6 @@ NAMES python${_CURRENT_VERSION_NO_DOTS} python${_CURRENT_VERSION} PATHS |