johu 15/01/16 20:35:46
Added: cmake-3.1.0-darwin-isysroot.patch
cmake-3.1.0-FindPythonInterp.patch
Log:
Version bump by Eugene Shalygin <[email protected]>, bug #535928.
Builds again with doc use flag, bug #535768.
(Portage version: 2.2.15/cvs/Linux x86_64, signed Manifest commit with key
F3CFD2BD)
Revision Changes Path
1.1 dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch?rev=1.1&content-type=text/plain
Index: cmake-3.1.0-darwin-isysroot.patch
===================================================================
Do not detect Xcode and set -isysroot for its SDK, since that messes up
our toolchain, and hence makes any compilation fail, bug #445308
--- Modules/Platform/Darwin-Initialize.cmake
+++ Modules/Platform/Darwin-Initialize.cmake
@@ -1,16 +1,16 @@
# Ask xcode-select where to find /Developer or fall back to ancient location.
-execute_process(COMMAND xcode-select -print-path
- OUTPUT_VARIABLE _stdout
- OUTPUT_STRIP_TRAILING_WHITESPACE
- ERROR_VARIABLE _stderr
- RESULT_VARIABLE _failed)
-if(NOT _failed AND IS_DIRECTORY ${_stdout})
- set(OSX_DEVELOPER_ROOT ${_stdout})
-elseif(IS_DIRECTORY "/Developer")
- set(OSX_DEVELOPER_ROOT "/Developer")
-else()
+#execute_process(COMMAND xcode-select -print-path
+# OUTPUT_VARIABLE _stdout
+# OUTPUT_STRIP_TRAILING_WHITESPACE
+# ERROR_VARIABLE _stderr
+# RESULT_VARIABLE _failed)
+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
+# set(OSX_DEVELOPER_ROOT ${_stdout})
+#elseif(IS_DIRECTORY "/Developer")
+# set(OSX_DEVELOPER_ROOT "/Developer")
+#else()
set(OSX_DEVELOPER_ROOT "")
-endif()
+#endif()
execute_process(COMMAND sw_vers -productVersion
OUTPUT_VARIABLE CURRENT_OSX_VERSION
@@ -91,10 +91,10 @@
# CMAKE_OSX_DEPLOYMENT_TARGET
# Set cache variable - end user may change this during ccmake or cmake-gui
configure.
-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
- set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
- "Minimum OS X version to target for deployment (at runtime); newer APIs
weak linked. Set to empty string for default value.")
-endif()
+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
+# set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE
STRING
+# "Minimum OS X version to target for deployment (at runtime); newer APIs
weak linked. Set to empty string for default value.")
+#endif()
#----------------------------------------------------------------------------
# CMAKE_OSX_SYSROOT
1.1 dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-util/cmake/files/cmake-3.1.0-FindPythonInterp.patch?rev=1.1&content-type=text/plain
Index: cmake-3.1.0-FindPythonInterp.patch
===================================================================
--- Modules/FindPythonInterp.cmake.orig 2015-01-06 11:50:03.376357898 +0100
+++ Modules/FindPythonInterp.cmake 2015-01-06 12:25:48.614989290 +0100
@@ -75,6 +75,11 @@
else()
set(_PYTHON_FIND_OTHER_VERSIONS ${_PYTHON3_VERSIONS} ${_PYTHON2_VERSIONS}
${_PYTHON1_VERSIONS})
endif()
+
+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
+ set(_Python_NAMES python)
+endif()
+
find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
# Set up the versions we know about, in the order we will search. Always add
@@ -99,12 +104,13 @@
unset(_PYTHON3_VERSIONS)
# Search for newest python version if python executable isn't found
-if(NOT PYTHON_EXECUTABLE)
+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
foreach(_CURRENT_VERSION IN LISTS _Python_VERSIONS)
set(_Python_NAMES python${_CURRENT_VERSION})
if(WIN32)
list(APPEND _Python_NAMES python)
endif()
+
find_program(PYTHON_EXECUTABLE
NAMES ${_Python_NAMES}
PATHS
[HKEY_LOCAL_MACHINE\\SOFTWARE\\Python\\PythonCore\\${_CURRENT_VERSION}\\InstallPath]
