diff options
| -rw-r--r-- | dev-util/cmake/ChangeLog | 6 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.10.2-r2.ebuild | 3 | ||||
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 |
3 files changed, 57 insertions, 2 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 3c3339ecae6e..18ccb456e7d5 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.234 2013/04/15 21:02:55 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.235 2013/04/23 19:42:17 grobian Exp $ + + 23 Apr 2013; Fabian Groffen <grobian@gentoo.org> + +files/cmake-2.8.10-darwin-isysroot.patch, cmake-2.8.10.2-r2.ebuild: + Fix compilation on Darwin, bug #445308 15 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> cmake-2.8.9.ebuild, cmake-2.8.10.2-r1.ebuild: diff --git a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild index c0819d88acc8..af92df0db90d 100644 --- a/dev-util/cmake/cmake-2.8.10.2-r2.ebuild +++ b/dev-util/cmake/cmake-2.8.10.2-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r2.ebuild,v 1.1 2013/04/14 17:41:44 kensington Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.8.10.2-r2.ebuild,v 1.2 2013/04/23 19:42:17 grobian Exp $ EAPI=5 @@ -52,6 +52,7 @@ PATCHES=( "${FILESDIR}"/${PN}-2.8.7-FindLAPACK.patch "${FILESDIR}"/${PN}-2.8.8-FindPkgConfig.patch "${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch + "${FILESDIR}"/${PN}-2.8.10-darwin-isysroot.patch "${FILESDIR}"/${PN}-2.8.10-desktop.patch "${FILESDIR}"/${PN}-2.8.10-libform.patch "${FILESDIR}"/${PN}-2.8.10-more-no_host_paths.patch diff --git a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch new file mode 100644 index 000000000000..97c93aa5831e --- /dev/null +++ b/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch @@ -0,0 +1,50 @@ +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.cmake ++++ Modules/Platform/Darwin.cmake +@@ -60,18 +60,18 @@ + endif() + + # 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 |