Fix compilation on Darwin, bug #445308

Package-Manager: portage-2.2.01.21890-prefix/cvs/Darwin i386
Manifest-Sign-Key: 0x5F75F607C5C74E89

4 files changed, 64 insertions, 12 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/Manifest b/dev-util/cmake/Manifest
index 2ff32e60e8a3..d90688d0893d 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -9,6 +9,7 @@ AUX cmake-2.8.0-darwin-default-install_name.patch 911 SHA256 98b93389ad9a39c819b
 AUX cmake-2.8.1-libform.patch 1818 SHA256 3b4ee03c7733b3fb468c5d4c6b139358be751b2398b56ca4ecdbf8a86b1f1ed5 SHA512 10ca910bc86c19beb00dc532c076bd0645b9e54a7472e24438f46a6eedce00855017cbe360b5552df05fec9ca5233cd1c2ca13d6f2e103791e9be2a5e23c1c68 WHIRLPOOL 7ea84d6b61a847d70e60380c7a7842e7e0c7d9e55d19c28557ad63e332f48adf0db58b946d00eeaf0842e51d52a2a90a30aca11bf45e6a21ea01b7f8e0fe3557
 AUX cmake-2.8.10-FindPythonLibs.patch 559 SHA256 0080885e637df2a0326cd33582d85842b7f274d345998a0df143045af76f23e9 SHA512 3b891029b0d4aa65990eae0143cd8727d07e5e07491e9d275ee96ae21614e8d3fbcc03e22a6ca5b503aa7de53bca01b8a909d6a769279ec3059a379912e139be WHIRLPOOL 04680f4fc18c719209bc7f6ce721f29d8f945dc3ca3eb2e2ae3fce0c3af062f425533e3151caa0c48e9af9a8e0cfcf3399eac5b6eb6cf02ee3efaed2fc7d06d3
 AUX cmake-2.8.10-darwin-bundle.patch 956 SHA256 8195342561ada36d4e3796a906fc662f9f84cc470809e7596b4376f3fe90dbac SHA512 39f444f592f435fbcc865a903ccb851b6c40ddf5f3b99b986c92af6b8984978d4fa1819808f1365f53887098da8533c31f6ea29e14cb541045ed3f63fcc771e2 WHIRLPOOL c20412508cad6329bebfb152051008c5ff98f0a27657d047992f4523a213d4ee396ea23c009ad2133b283ab4518d359b2b65d5034e06bd5649a6f08d76cb5db8
+AUX cmake-2.8.10-darwin-isysroot.patch 1913 SHA256 a706da7288dd1f1fcd78291e411f34cb5e6d8eec3ea620011da9c7182e3e4df6 SHA512 862fcedba5abab3f7dab6eb56a680cc0f81090e551a1519f40a638a3dfd08ec083b2c67cdd174f2f32aa3e417b178e8b3bcde1e9db9d34f740b8e72be4306c6d WHIRLPOOL 46a523c1e9c8f17828a3130cc1ce37810cea408d04870939f30c4a5c0e777e1c5537b3e1c2e36690f6a21fa783057d6f5f9b8b7186b45b0f8056dc72041cdd1d
 AUX cmake-2.8.10-desktop.patch 370 SHA256 747eb8c75f82d1edf9683c31914892e19118670d4e2e955cdcf5a14f25fefe15 SHA512 bc5c6ca27e3317ac7c65e09733331e3732ea31c28d5b08b7fbd150845cf6657238b017d0782237ef57abab9fec249cacf78762dfe66c6389bc0fd9a91add0f08 WHIRLPOOL 5c446ba04f0d88a022a415c03e601ee6dc7cbfaebe8c564f9e5ca88a92e9f5755ae8435789e477ff14980a22e690748c7b0bc602e51bc8a074fb025010337dbf
 AUX cmake-2.8.10-libform.patch 1598 SHA256 8635248bfebe157e545eddc3c16223e4d8c51af51a8d224ef1003a043ce468f4 SHA512 08a0fb45f2b4c1a8ba0e961539d650e38feedd4b2ca3b5acc2fcad3d68fe3fcdb5b114663b1f84b26027e902d28cc2d4f50cc1e3491ba90d6c3c273aa32d62d9 WHIRLPOOL 505231f51be487dd71eb2f17cb65560eb86039673a593e1e76f3d7f27c3cb64dad36ef1c507aa9e97aae28b20f642dfcb4d023537e0a1af361e74c43b88a51e1
 AUX cmake-2.8.10-more-no_host_paths.patch 4221 SHA256 adf64e6357c69d6153efcf0bab708e209071237e29b7f04f80dc7708726a8034 SHA512 c08340d0cf5c4d931fa3a608fafd0eb950cc7f2f9bed2bc152c973f27a2b1c880f13bfbc55698534d533b62f5ed1a03347980d07bad2abae8379f7d2e630e6ee WHIRLPOOL a259a4c8fd271d704c0a6135352f4fdeed9a9aa50077aa1a520889b8a636366c9c9b8632808e54740f9eb7413ab8e0a453a1262b9224839486176690774ac696
@@ -29,18 +30,14 @@ AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7
 DIST cmake-2.8.10.2.tar.gz 5768373 SHA256 ce524fb39da06ee6d47534bbcec6e0b50422e18b62abc4781a4ba72ea2910eb1 SHA512 e79759f4429977bb4292c9dc8a9d216ca7c21dca5fefce1fa223d7847a1128c8a3a11e1b6adaac40b2f30e0d6f504508a2845f888a319acc29c2ef6beff55df2 WHIRLPOOL f7327282d352ec04afb6349abc74aa3205ceb57efcb013650f18025e36010a27ca28725cd06e29e7bc5ff3196a4c8abeafcb733fba9c6bcc02159a5c6b8e90eb
 DIST cmake-2.8.9.tar.gz 5658837 SHA256 dc3dcc7399be8636471975f955086cdf800739862c240858a98e89719e45e6f9 SHA512 d489fa1c720324d03d5fa6605ec5f39f99f98c2ba3f1754e9450fec35e4d9f9479638365ab813014fc648fe05096a519f387ee03f21b3b8b77088fde2857b6e0 WHIRLPOOL 69f0846b39b3e61f0f4774c702b74ed7445f67eeae8ae3e07f7d36c742966767eb9e39b2911c8e612ce0afdc4e24977f7afe2ebab3159d3096e1b2ba86b8247d
 EBUILD cmake-2.8.10.2-r1.ebuild 5042 SHA256 a00cd5df083552863fc55ff6bacbb12649780df6260b2601c3ff304f163cdf2c SHA512 8578b70a80d440b4d4d90ab8c9cef34544ca1dc99ff2717d5ed6e38888bda45627fbf79858dfaa67858d0ba1466c74340f6d843a5fdfaee5eddf8893c10b8c30 WHIRLPOOL 61bacc1ad17ab2a2109b0fea592756ca6218086a090b45b02288cac3cefe6b7ed2ddfad79ffb78ab8298bad363bed660b3744c59b949f323edf2f3bd688c0af8
-EBUILD cmake-2.8.10.2-r2.ebuild 5029 SHA256 4d033b5a13eca24fe41a895435b93cca106aaa9da12aa570be71d158513bc435 SHA512 7324e8ed9caf5d4997a600cca0ada8b00c3ff743d9e9bbda8d7c8efa4e60ab0e7004c8904323e7a6f491abf8877e9e54d15095c55e23a59c404b5f381ce16335 WHIRLPOOL 6173740bffa8819e53371fc354b77097dc3f6098531ccc67a545b64867d5ed34ea86358ef8433d56119c90b628ceb58fc9437dfb5884c2086caf20a17afb2915
+EBUILD cmake-2.8.10.2-r2.ebuild 5076 SHA256 121c3c5777b9c6d63c5b8e772759cf21214a77c17e7a631f0fc07f4fe23faef6 SHA512 4cab7cdd05235e7b0ebdc33407f0cde218c3ccd5605907c6fd1112933cb2fe779b2d6914309fd251f85c5521b015b5f58db01a5d62a805a7e093001bdd2163c4 WHIRLPOOL 16527cfc90a47478e64bfc53106c14b7e054124365188fd6fee60d164e2c96b71c44f0d7e51d579e42b7f075404fadd17761549758252510460edfd6ccf9736d
 EBUILD cmake-2.8.9.ebuild 4905 SHA256 54ffb9e282db60e22538097272ac72be6caa92faab6029ce075fe50950244eab SHA512 1d86944107c13952ee90fa3affc0f3c109b92ad4e443d4700e583b4f8ca63743e94c7b289169afceebb2ba55dd89fcdf39f66eff69410f10d6b140aa48a11eb9 WHIRLPOOL 7e58275992ac62fe8b4cac75348a9f28f2fca9575c84e806402a53a6a561f2bb8fb4583bcf08c92577470cd9c0acdbf2de448acf187e4e83564348c822178164
-MISC ChangeLog 38120 SHA256 f334359724d739cb83cc0ccaa44dbc48925f035f5dbfd70236e42ff0959d3ef9 SHA512 c56bd3f7fd02bfccd9b439dcb9e094291295b604a1dfef626ce8015d851a0b88304e1d4556ef6b9e2b35174dd6353c690944cb643660e81f67b0dd053e989c48 WHIRLPOOL 4acb3cbf6f52a3155a82de63c39dc959c5cb8eb3cf82c2af7fe9e01357daa03b24123938ffae4480abad39f4a871e33a2343eb6475be1798c0a126fe0da5ec0c
+MISC ChangeLog 38282 SHA256 e2849b115f61639281bb312e80ba5df71670ea07ce64503aec6efd1f2ce1334c SHA512 66b48f93ee9ae74a93d9431fd92f7db24f018f866b66d97854bc6ec37c97e6c81e4732bd70afc6e0aa338f71d5941c3633af20d135884951ce33845be221a016 WHIRLPOOL c09582676da8cfe94ddab078efc3ea5897a63e79c8fcb3f9676ce00c9d80a432fa15e4a9c88878cb012c117e577988004c46ea76efd17f94c62a9b51c53f44e1
 MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.19 (Darwin)
 
-iQEcBAEBCAAGBQJRbGrfAAoJEEdUh39IaPFNl80H/2M36MFG3YlM1ApY7tchVr5/
-IDLb6YhEC2/UyG+azO+Ob5ZyaChSny63hhwQUtMhBa2FY+13PUBHCFs9+TAJhscJ
-2IjSGUAbHyZjob+8d82/XPLMGrnncERBEalGI2RAw9Fi2/XyrFGVYjRxqlco6dw+
-AsmwvZotcFyZvVKr1fzLM96xxA4DhhLsD3/BWutn/lvcU1gjGN24VTu6SmljTLBs
-AI+aC+vv0fBVgeQKA9wi2pMZOaSHSU7nxb9OFTkqQiSOlkiImpI1Jc9wlr/IrUfb
-cVTqUMHiTX/Xa1TQWy0ng8k8uEga07ktRaKzX7oQ8D5j5VH6lQ/4VdLWNSnLO4o=
-=CX/4
+iEYEAREIAAYFAlF25BoACgkQX3X2B8XHTonp8wCcDF+tE/s/YOUQIO24cWlWqspR
+hqsAnjOmJwnwHYknqW7VDOm8o6I8vctl
+=ckht
 -----END PGP SIGNATURE-----
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