diff options
| author | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
|---|---|---|
| committer | Andreas K. Huettel (dilfridge) <dilfridge@gentoo.org> | 2013-09-07 14:43:17 +0200 |
| commit | 1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba (patch) | |
| tree | 475ec53133c361c13c0a1b1793fd1e00c1e0b3ce /dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch | |
| parent | f5837fc796cabbbe572d5b5879eb4ce0aef665b4 (diff) | |
| parent | e1cdc85bc123113b6b9fb4212effda45ef262185 (diff) | |
| download | kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.gz kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.tar.bz2 kde-1b90e87f73cf4e74b2fe16ed3855ecc974c8c0ba.zip | |
Merge branch 'master' of git+ssh://git.overlays.gentoo.org/proj/kde
Diffstat (limited to 'dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch')
| -rw-r--r-- | dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch | 50 |
1 files changed, 50 insertions, 0 deletions
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 00000000000..97c93aa5831 --- /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 |