diff options
| author | Michael Palimaka <kensington@gentoo.org> | 2014-02-26 06:22:40 +1100 |
|---|---|---|
| committer | Michael Palimaka <kensington@gentoo.org> | 2014-02-26 06:22:40 +1100 |
| commit | 49f71dc215bb4d7337c826e7fbad8b1539e5ab81 (patch) | |
| tree | 36d4d2a2ac00ef3d3141a0dd35df64610524b46e /dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch | |
| parent | 0f1b15c95fa4d0fbe77c819166e39f52c9566275 (diff) | |
| download | kde-49f71dc215bb4d7337c826e7fbad8b1539e5ab81.tar.gz kde-49f71dc215bb4d7337c826e7fbad8b1539e5ab81.tar.bz2 kde-49f71dc215bb4d7337c826e7fbad8b1539e5ab81.zip | |
[dev-util/cmake] Improve boost python patch to fix libboost_python detection outside of portage wrt bug #500442.
Package-Manager: portage-2.2.7
Diffstat (limited to 'dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch new file mode 100644 index 00000000000..2a83ff7abb6 --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch @@ -0,0 +1,24 @@ +diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake +index bffa9fb..8fc90ee 100644 +--- a/Modules/FindPythonLibs.cmake ++++ b/Modules/FindPythonLibs.cmake +@@ -74,6 +74,19 @@ set(_Python_VERSIONS + ${_PYTHON_FIND_OTHER_VERSIONS} + ) + ++# Gentoo portage requires that you use exactly the given python version ++if (CMAKE_BUILD_TYPE STREQUAL Gentoo) ++ execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))" ++ OUTPUT_VARIABLE _Gentoo_Python_VERSION) ++ list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX) ++ if (_Gentoo_Python_INDEX EQUAL -1) ++ # the current Gentoo python version is not compatible with what is requested ++ set(_Python_VERSIONS) ++ else () ++ set(_Python_VERSIONS "${_Gentoo_Python_VERSION}") ++ endif () ++endif() ++ + unset(_PYTHON_FIND_OTHER_VERSIONS) + unset(_PYTHON1_VERSIONS) + unset(_PYTHON2_VERSIONS) |