Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 559500
Collapse All | Expand All

(-)a/dev-util/cmake/Manifest (+33 lines)
Line 0 Link Here
1
AUX 50cmake-gentoo.el 244 SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 SHA512 70af0b9dd41f08531d3c754dc8af3662df8a22b469b79e8c40b7caae3205be1d4dc81d8b41837d1b6a46f2c348f5407e09e02269823c45c3366777e3bc7a0dcb WHIRLPOOL aa60ffe7e5edd00fdbb32ce2c9aee24fddd6e4d064b8bde55c7ff3b42196c3420596653aade9cc447a3293050c5ab23a27a556f26806e4d67139d264a38d1aaa
2
AUX cmake-2.6.3-fix_broken_lfs_on_aix.patch 1366 SHA256 e403b204b3f64e5fb01af631c0bb72f083c3994cb7af91dd54b92458bd08a439 SHA512 fe3148f9a09363c5943f09b963391a4276f2da6095e66c28a1c365fd655e2124e1931b40890152836e24a3c9e330db799199d8ae295fe4581f7124b42f09f928 WHIRLPOOL 322a805a2df9afa40c7ff217481819462d90d8259856696fa4ef76fda1571fa081577eb8cd06fbee899911b01243a912e43a9dcc667932f9885492fcb92c0f98
3
AUX cmake-2.6.3-no-duplicates-in-rpath.patch 794 SHA256 908ea65a9db5ca85b2061ad63de714e59930aafeff010939be4829eb60b301c7 SHA512 13dfb5d1ed271eaf673aa53c40a5a17a89812c7617e840ffd3df962e9ed6e46da7b507121f56314a2ef8b86a80b2453cf327684e2c4e82bb903cd8210807f507 WHIRLPOOL b43a187a6f90590460b6e499630a6f6d550cee09309c4c32c0b7d68189bcd84dac309ae4b80bc345de5b32dcc4ac94f789c1fea8162cea4175847c49dc862ccf
4
AUX cmake-2.8.10-darwin-bundle.patch 956 SHA256 8195342561ada36d4e3796a906fc662f9f84cc470809e7596b4376f3fe90dbac SHA512 39f444f592f435fbcc865a903ccb851b6c40ddf5f3b99b986c92af6b8984978d4fa1819808f1365f53887098da8533c31f6ea29e14cb541045ed3f63fcc771e2 WHIRLPOOL c20412508cad6329bebfb152051008c5ff98f0a27657d047992f4523a213d4ee396ea23c009ad2133b283ab4518d359b2b65d5034e06bd5649a6f08d76cb5db8
5
AUX cmake-2.8.10-darwin-isysroot.patch 1913 SHA256 a706da7288dd1f1fcd78291e411f34cb5e6d8eec3ea620011da9c7182e3e4df6 SHA512 862fcedba5abab3f7dab6eb56a680cc0f81090e551a1519f40a638a3dfd08ec083b2c67cdd174f2f32aa3e417b178e8b3bcde1e9db9d34f740b8e72be4306c6d WHIRLPOOL 46a523c1e9c8f17828a3130cc1ce37810cea408d04870939f30c4a5c0e777e1c5537b3e1c2e36690f6a21fa783057d6f5f9b8b7186b45b0f8056dc72041cdd1d
6
AUX cmake-2.8.10-desktop.patch 370 SHA256 747eb8c75f82d1edf9683c31914892e19118670d4e2e955cdcf5a14f25fefe15 SHA512 bc5c6ca27e3317ac7c65e09733331e3732ea31c28d5b08b7fbd150845cf6657238b017d0782237ef57abab9fec249cacf78762dfe66c6389bc0fd9a91add0f08 WHIRLPOOL 5c446ba04f0d88a022a415c03e601ee6dc7cbfaebe8c564f9e5ca88a92e9f5755ae8435789e477ff14980a22e690748c7b0bc602e51bc8a074fb025010337dbf
7
AUX cmake-2.8.10-libform.patch 1598 SHA256 8635248bfebe157e545eddc3c16223e4d8c51af51a8d224ef1003a043ce468f4 SHA512 08a0fb45f2b4c1a8ba0e961539d650e38feedd4b2ca3b5acc2fcad3d68fe3fcdb5b114663b1f84b26027e902d28cc2d4f50cc1e3491ba90d6c3c273aa32d62d9 WHIRLPOOL 505231f51be487dd71eb2f17cb65560eb86039673a593e1e76f3d7f27c3cb64dad36ef1c507aa9e97aae28b20f642dfcb4d023537e0a1af361e74c43b88a51e1
8
AUX cmake-2.8.10.2-FindPythonInterp.patch 651 SHA256 bae58e84982de8331a4038fdc1339baa42512ffb254dfbf553d3bf6f04221cfe SHA512 a1c68cc9f24addc771b8eb33ca6ac0d841311b634e5c5d6500924d70678408a666353791a8b2a00013e1b31545ecef6d26f939216b8fe7dcb8b6152c9e89f17c WHIRLPOOL 3c6a3f084d402244d8628bce6ac17a11eda0d55ced3824584284f63b5f1300f89921941257ded395e2aec88950ab65ca80dd9ff0fa6932f7eee908bd4778c688
9
AUX cmake-2.8.10.2-FindPythonLibs.patch 968 SHA256 4a2bbd60a2c526387ac8088d6bbecff1cc4399259d737530f2d55a6afd033b15 SHA512 e42713242202409e06a1b0725c6ea0a89c6d623d143e6c06def9681b72516a760ebddeccdf16e141e6b21ced2fb63e42337536afd6ca799e6d6d8689d48037cb WHIRLPOOL f92e7981f267310e471425b9f6595c54bf6df2af3fd99a0502bebaa39d87dcc14e31389d1c1bd99271718ce6b33f837842a0cdb454de09da60df5252f86cf826
10
AUX cmake-2.8.11-FindBLAS.patch 1524 SHA256 d59a2d1fdbab24d25c90e22047569745b6a2d80318d0914ab21c704286b1d15e SHA512 20b4f594a5fee9e20cccd1ec79797d2ac2e930ae2252ac544248ee7825ee76dbd32459ae6b87afd0d684a9a780dd1e1e78da361519dbb767fe761eeff6b545f6 WHIRLPOOL 38e13557dc7009ba422c5e6487b89c9847c2b51fa69c0d02eac20ea8c9d9d212a5b66f4ab9049d241ff0e4ffc23096117592c584b3b787dceb5e225a06ea9d75
11
AUX cmake-2.8.11-FindBoost-python.patch 5287 SHA256 95784f74c82fd412d81c850ccea8e2b0e333084dbd3dcaca3d2316986828e5c6 SHA512 db6ab343d3497ac2314250d094d4b608e83ca9d7f5c04d3b98e4461bd4655e155c189c39adffa9d31264564de6e382e227ba70c8c6ee8ab14dd8dbb7004490ef WHIRLPOOL 16358f1d91bd8ab79d51d3a772380b4e0d9ca65443dff685109e88e0c383f4edd181fdf7737cea7f8527684143704ba9154b3569dbe31ab34c9fdd2606c6487b
12
AUX cmake-2.8.11-more-no_host_paths.patch 3797 SHA256 09a583d102f491c49d65282a8665ffb960f5801c7addc79e858a002d0c26ef5b SHA512 cb3bde23246c93f27d7cff2f0bb7fd17b0286da201a68a68abefca881cb2395844fe0adfa091f2f7657f44a56f2c5fba794430effe1edf0596c16f2d34c825bc WHIRLPOOL 5d53ba1a375da31cdd50cef63072480d3f0a77e785cbe6ee16b82ff6249e4244ad7ff67c9971533705bc97e396332ae0936bea3c6ef2002b5fc7f3a88d8036e1
13
AUX cmake-2.8.12.1-FindFreetype.patch 1404 SHA256 68e4d69aadde939087d257e88273e6fa075b9533dcccc32b0c3ed7d96af6a832 SHA512 f07a6ca20251bd517e4e63ed81a6d67c388de7c53cce6177252a86eb1c68b3fe2ecfdf7493d3f6baba56d58d1b35da181dee7f4a99ae63ac18b0c2398f3d3d76 WHIRLPOOL e7ab5a1987ba1ae0fe8e91ff1535cc870cedc3b4282d4c3721a627cd8fc948a5e2f81214287cf50b35f7b20928526022ed13bc900fd8334244c10c89435267c3
14
AUX cmake-2.8.12.1-FindImageMagick.patch 1700 SHA256 042a843bc6204efee071af2cdeb451c5da3da852cba0d522dea1d264ff1014c3 SHA512 4c533e3bf3127eb0696b557fe381bfd88f3ebc70b29a33f04b7bf95fa7c765cb237abe34b6a406b452dd71fbc3d79740d58ae981eedca952f9fae272ea4f5efa WHIRLPOOL 25c5c7c47b2874b32143a9fe14443aa6da8f3abb6c92b0bd94f3848dd7d8114d901a0bc6fbb78547879f5af947f87f070e24cc2deeecd7bb4cc95290a7af7d40
15
AUX cmake-2.8.12.2-FindBoost-python.patch 5494 SHA256 4e514122d8078f2b1db10c842f2c5d35713849b72d742848281954040eade4cc SHA512 450be7d80edd54e9d2a609645a0c58f6672fbe623a49bddfa01c3903f9fb2f0d944ae7bc884829fcb48c194e873bede372dd350b9a9d521be2ff2c0e3198b0cb WHIRLPOOL c8486b950f35ce4bad76ba9dd4b3b256c8b6a62e5321d1cb1f99ca5a3c8146830eea5c487494571d92bddf0a10a2db5d89e5ad53bd0aca9f29d218665290077a
16
AUX cmake-2.8.12.2-FindCurses.patch 1525 SHA256 85d71d32b0bafffaa2c24e6e7432db1c35e04eae790fc27e515210c8c5f7e812 SHA512 74d6390fa253764c7d6e94e5ed566b886dcd93f35ce840979faeb86f48e3cb5c35aa77895adf39df5708954c256dbd2d277eb1f58f21829805abb11ba2802462 WHIRLPOOL b4041827630a9f53f499d3b448c30cdba32ab4d7962d51e1e6a8a779f55d502a529127ebc477331d3d4fdc87249449e95a51601ca10125d75d19605204e585a6
17
AUX cmake-2.8.12.2-fbsd.patch 1269 SHA256 9005632e98e9db50f6b71fd701babc345c1d194c506bcf4bdbc169fcaaf85533 SHA512 5e66cfa8d56f55a24423197815e6441c347d625cbe2529173686e4aa09995872a25265849b755b9b93695414764825a79d32eed4a38493d7fdf9857b66ae6aa9 WHIRLPOOL fe48e879b67ada6ad5ecac76bf4ec936463477d37d1e3dccafa1e2ff27d33d5a4c95ec82052c75a0ac2030b9aeea63509c269dbd2e1d5b440fd170a2df4435ae
18
AUX cmake-2.8.12.2-hppa-bootstrap.patch 1195 SHA256 fb31515c540fc6d5b2e9d0a3ba3df8d11a74b84fa474e3845285345a219c8a65 SHA512 25ca780843248638502d389d078588194a4eeaa2cde163076b57c588ea6acf78a8ee832eb76d45b747467b31da5562f7d05715ecabcb6c1ce985a98d5f677e68 WHIRLPOOL 41d723a818b6e8d0993abfd6cb77ad505013526b4b2ba11e00200b590b9a27efa1dabeef02ec22c9dafbbcdb003b76b110ce0c9b22f0f1d8a29adf35ccd6de90
19
AUX cmake-2.8.12.2-python34.patch 1199 SHA256 72e8f1924ebc8739f6256bc35f65774658ff581192118733541fc242c96523e8 SHA512 4740321664c0eb0b19478eeeea20d848660dbe9e77959168fb1624567570eba0caee8179c5f4caafbac8ec46b56a9600aff3aeb43a8613cfe441dfe87d080a96 WHIRLPOOL 4fa63fb7b76557b78a689a38b8822bee3f166bf462647c83cf00b9b63381b08410fcabaedc12903436b9dc44b6db4b2f53ee0a75c6c833b8487153d8f15d7cb2
20
AUX cmake-2.8.7-FindLAPACK.patch 1744 SHA256 5dbbeaf0532fbdbd24f94175f24c26567d1ec32d409d91de9558f7e8f567323e SHA512 c5dab9c697df3593b8fb5222e619ccc1b1cc82beae0cd685ecabb1a0e31193cf663e95dc4d556e338c9f45e451fcb0fbc1a5f0bc39a65c67e6d9d9193f049990 WHIRLPOOL bc42012b830f998c5b8b892b84314fbc5ec6fdbdae627c2364d112a3e48c5350df9334b17e8b91bb4bd6377f10cc927fd3c3c8008370343fc19d43eef1fda005
21
AUX cmake-2.8.8-FindPkgConfig.patch 658 SHA256 3261fce9682f476f121aa3d30126e4f8d866b138c887c19d6f47b60df3de9cbe SHA512 b52986a9faf2329096452c3cf4b3066c2eb51b37d057bf46527dc7797fcd795936d63ad287419c2eba6ffcb0134b24544d62fb5c449e6a25354b65a4d5c63d8f WHIRLPOOL b444f6524b1e24d0c1040508babc03b229e7bac7ba11c978d155252fc8df9d052f7f23010c0db027af9f41e594d6ca131e6018f58a21d83f797762ddf644b911
22
AUX cmake-3.0.0-FindBLAS.patch 1577 SHA256 25be4e8671eff94b5cb7fe955215d9b97cc39e61f7203b4eb9b28e16977c3842 SHA512 c6239fe3d8b8e437b66399a3ebdf09da94f747dc6c45aaaba43773ce29a106727c7d4f8a570e1fd9603a9cdbade6b9702398c1989267adbcc5aebbeb59d30915 WHIRLPOOL 44366678ff681b3c876c90274d3b6709ad4ef7de051663db03fecdb77baffbd87b02c5edf53126b383680a58ef4c0a0100982240e58db352c781cd204907f2bc
23
AUX cmake-3.0.0-FindBoost-python.patch 6481 SHA256 bd8ff52ce3565ab67806e2417d3c1e3c05215dde1da588f65dfc8db061ea3116 SHA512 4eed678c74af89e249de7202c553825cfd0132b84d605d078c388224a1add76acef778f366bb60e52e58e9ca25a23e18f8f6bef7385a9180fb1cab7d7698ffbf WHIRLPOOL ba4965b6e390a30178cd99806eda5d1fd669ccb894ba94d1f8ea358dcfbf10f9559918711912786cc3be16569b87d931d13712bd84a433b561f1092d8c71c416
24
AUX cmake-3.0.0-prefix-dirs.patch 4279 SHA256 5f5f544a861c8c79fe668cbe65bbba8c8c83e4eca82503f8e7b193ec476c2225 SHA512 f90b2114aa84509fe3763d5c2d29460c84334aedc48f1856e646d7118a80ece72b57084f9ee7e8669ce59d61337d967e8d01f6a68b7d3580f2230a804a0ab2ee WHIRLPOOL 70761c4b3c7886ebcf1d052237f77eb871b92846a35281c911c6cf5ef867d3df09b563399113ca8f7d6f8e912b9c170b074d296b82a480dcc4c8dd10ebeab245
25
AUX cmake-3.0.2-FindLAPACK.patch 1442 SHA256 394388bdf47c995bc540537ad2cb497c719eafc5298a19d41d1a672c02d3b221 SHA512 60b673005bb3cec6830a3f68922c5661bccd8d7d39d77172d1f59383e8f9912e3e74e052d5e632479d1b091357dbabef656049dffaf705cebae9ae99ea35e74e WHIRLPOOL 7b46096381aa9a94e92c9aac80993a3da75b80203050f609adf7672ac238d4dd3ad89ff8261e87bd040a4ba5b4b1b4e73bfdf9ac3ba55b2c33a6f7800315748c
26
AUX cmake-3.1.0-FindPythonInterp.patch 1072 SHA256 463c0a681b92ed02f7802153457d530109c6a6ec686d6c02968ea84085134705 SHA512 5e3445f43793fbea561d24cf502d06264f3f27134420d7df18aee678901bb895912a0b7b7f73ec7321155284f821aab5dbd6046bb050c02f58a0bd5188dc85f0 WHIRLPOOL 65aaa246da0230df4ff45a21e398224751d67820153ed5b871ee6095ae97804da98057de114354ec7ff2abb8f438fbcdd5c0b70a718fef6974d39ee69f94ca6e
27
AUX cmake-3.1.0-darwin-isysroot.patch 1922 SHA256 05b3f77f8f8a25c809cf0819867fa785a739d3dc9c34e5e9fbbb6b4ad9115710 SHA512 9fcdac45f1c4d8c90839e5f4a6c9f1d28c1767bf6b1767dd7d8d04d332558ef8dc775af65926c3d08a72a6e535c063a85956bf20a10e48016fa13533037979d0 WHIRLPOOL 31ea327e6c41132923a26dfce39b19961b1862e79fcfa3f9c80773f6c3181acbf44ab655a2b837c0ab2165d918c8709aa82321958ca4e0d93277d0a2a47c1127
28
AUX cmake-3.2.2-musl-fix-includes.patch 2713 SHA256 99929a021def1104e388d9fc95f96695621386312f2f0adec7d3c92e8dcd3c3d SHA512 2f4351ffa5eee60d4763e779db0cd4a1ad9ca376854b38d29cf272372059e382693edd8a8f2a9ddfd1b4f068ec9b68666879bd3270738c2062a6d7cdfa15fef3 WHIRLPOOL cf6d05104547deb09df98851371030b7cb47b0532c98be413ea43797d7cdb8b466f7522fee5d61625cd36ada62319a2ce1c829b00f90af6b338761febab8bbf9
29
AUX cmake-3.2.3-musl-missing-include.patch 959 SHA256 abb5e1eaaa3b07dc41e131ad9f42421456ed28b80b8390a4ef1b7770e4d35484 SHA512 340d01ecd3f5400bff850071c50b2068daf0bd1fe154235c7c0bca88524777dc418b53c5e1baf6e08741da3be2bcfd996da406dfbfa6d24ccc8185c0728d8162 WHIRLPOOL 48ef76ec94b3589993f21e63ee34e9d4b29a56687c067a06b3617b79f80c9012bb2f4d4d718fab855011d57f11d12e14761495a1a7849481786704e7069f7b02
30
AUX cmake.vim 217 SHA256 7366c1d45bdcc93efb1954216a5427a5f9df7e98a1f706c357576d7835aaebc5 SHA512 2f7e9e949f8f3030a0dfcef56f4effea703ee60555c22f6a2d1dfeaf3334f33a3e88910c666f704e4ab60cde4ebb509c7d85d812a3c1627010e52fc757f15cdf WHIRLPOOL 088ae1f0a4f32ea872deaf1d4e8d21d6853d3cecb903ea8abfb06c85de8c200757c2cfb34ec25cd0d8ef2a3c12b3cc9472e9ef0b5ce3f702502100806e0e73fc
31
DIST cmake-3.2.2.tar.gz 6438736 SHA256 ade94e6e36038774565f2aed8866415443444fb7a362eb0ea5096e40d5407c78 SHA512 b7460733ebf81e6c0cade84c26407f474e1b0a7372d19ccadf928a8578a53043fd76c507b45a00762161aaf6938a59df6110a1eb11a7678bfbc984b020e5d68b WHIRLPOOL 7debc5ac607578feee1c322416ac132ad4ba00a40410e03ee5cba52290f2f15904e7d0f2b77da37c9e8caa379b0530339fb2cc87246209f7999f10e44637f2d2
32
EBUILD cmake-3.2.2-r99.ebuild 5242 SHA256 d60ec765d5c528b2f5f0be3ad7b40a823c4cb93eb47895d6f8e34266ed67291b SHA512 4f2bbe6d950eb71f46e7f3c214ba5d76fee5d444d06125e5e99f9342ffa75de64f85f7454acfdc881b5a50dc88606773a9ff6d5fe34c8c743aa88f3a5629f07c WHIRLPOOL d5078a04e3a6c6b0c7b3b9e45c8bfb2b18ed292ff9d95a246e757ed605c94345ac370e16075504b245b34a407abffd1bc51021937fc2e78d3d01ae584427b99a
33
MISC metadata.xml 280 SHA256 9c11fcc54fc2212abdf8d07008cdb7cd8c1352fb59aeabebf58ee6aa89fdd8c5 SHA512 7b3012e7dcac7f1a9d0bf66616fd5c43884d236d1d617993a6ad8b142af0a0609c7c87fd6f1f60e0187c4138246e63733bdce51ddc0ccf31523427e96b9c737c WHIRLPOOL 122044a3ae23a55d2a218478e9c309e9c373e0f00f22a1d97d4c9178cbfa63f4a250a1eff9e2ba6f7e3c80c457fc232e5219ce685347103324bb2b15c59cf4a1
(-)a/dev-util/cmake/cmake-3.2.2-r99.ebuild (+194 lines)
Line 0 Link Here
1
# Copyright 1999-2015 Gentoo Foundation
2
# Distributed under the terms of the GNU General Public License v2
3
# $Id$
4
5
EAPI=5
6
7
CMAKE_REMOVE_MODULES="no"
8
inherit bash-completion-r1 elisp-common toolchain-funcs eutils versionator cmake-utils virtualx
9
10
DESCRIPTION="Cross platform Make"
11
HOMEPAGE="http://www.cmake.org/"
12
SRC_URI="http://www.cmake.org/files/v$(get_version_component_range 1-2)/${P}.tar.gz"
13
14
LICENSE="CMake"
15
SLOT="0"
16
KEYWORDS="alpha amd64 arm ~arm64 hppa ~m68k ~mips ~ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
17
IUSE="doc emacs system-jsoncpp ncurses qt4 qt5"
18
19
RDEPEND="
20
	>=app-arch/libarchive-3.0.0:=
21
	>=dev-libs/expat-2.0.1
22
	>=net-misc/curl-7.20.0-r1[ssl]
23
	sys-libs/zlib
24
	virtual/pkgconfig
25
	emacs? ( virtual/emacs )
26
	ncurses? ( sys-libs/ncurses:0= )
27
	qt4? (
28
		dev-qt/qtcore:4
29
		dev-qt/qtgui:4
30
	)
31
	qt5? (
32
		dev-qt/qtcore:5
33
		dev-qt/qtgui:5
34
		dev-qt/qtwidgets:5
35
	)
36
	system-jsoncpp? ( >=dev-libs/jsoncpp-0.6.0_rc2:0= )
37
"
38
DEPEND="${RDEPEND}
39
	doc? ( dev-python/sphinx )
40
"
41
42
SITEFILE="50${PN}-gentoo.el"
43
44
CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
45
46
PATCHES=(
47
	# prefix
48
	"${FILESDIR}"/${PN}-2.8.10-darwin-bundle.patch
49
	"${FILESDIR}"/${PN}-3.0.0-prefix-dirs.patch
50
	"${FILESDIR}"/${PN}-3.1.0-darwin-isysroot.patch
51
52
	# handle gentoo packaging in find modules
53
	"${FILESDIR}"/${PN}-2.8.12.1-FindImageMagick.patch
54
	"${FILESDIR}"/${PN}-3.0.0-FindBLAS.patch
55
	"${FILESDIR}"/${PN}-3.0.0-FindBoost-python.patch
56
	"${FILESDIR}"/${PN}-3.0.2-FindLAPACK.patch
57
58
	# respect python eclasses
59
	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
60
	"${FILESDIR}"/${PN}-3.1.0-FindPythonInterp.patch
61
62
	# musl includes
63
	"${FILESDIR}"/${PN}-3.2.2-musl-fix-includes.patch
64
)
65
66
cmake_src_bootstrap() {
67
	# Cleanup args to extract only JOBS.
68
	# Because bootstrap does not know anything else.
69
	echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null
70
	if [ $? -eq 0 ]; then
71
		par_arg=$(echo ${MAKEOPTS} | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | tail -n1 | egrep -o '[[:digit:]]+')
72
		par_arg="--parallel=${par_arg}"
73
	else
74
		par_arg="--parallel=1"
75
	fi
76
77
	# execinfo.h on Solaris isn't quite what it is on Darwin
78
	if [[ ${CHOST} == *-solaris* ]] ; then
79
		sed -i -e 's/execinfo\.h/blablabla.h/' Source/kwsys/CMakeLists.txt || die
80
	fi
81
82
	tc-export CC CXX LD
83
84
	# bootstrap script isn't exactly /bin/sh compatible
85
	${CONFIG_SHELL:-sh} ./bootstrap \
86
		--prefix="${T}/cmakestrap/" \
87
		${par_arg} \
88
		|| die "Bootstrap failed"
89
}
90
91
cmake_src_test() {
92
	# fix OutDir and SelectLibraryConfigurations tests
93
	# these are altered thanks to our eclass
94
	sed -i -e 's:#IGNORE ::g' \
95
		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
96
		|| die
97
98
	pushd "${BUILD_DIR}" > /dev/null
99
100
	local ctestargs
101
	[[ -n ${TEST_VERBOSE} ]] && ctestargs="--extra-verbose --output-on-failure"
102
103
	# Excluded tests:
104
	#    BootstrapTest: we actualy bootstrap it every time so why test it.
105
	#    BundleUtilities: bundle creation broken
106
	#    CTest.updatecvs: which fails to commit as root
107
	#    Fortran: requires fortran
108
	#    Qt4Deploy, which tries to break sandbox and ignores prefix
109
	#    TestUpload, which requires network access
110
	"${BUILD_DIR}"/bin/ctest ${ctestargs} \
111
		-E "(BootstrapTest|BundleUtilities|CTest.UpdateCVS|Fortran|Qt4Deploy|TestUpload)" \
112
		|| die "Tests failed"
113
114
	popd > /dev/null
115
}
116
117
src_prepare() {
118
	cmake-utils_src_prepare
119
120
	# disable running of cmake in boostrap command
121
	sed -i \
122
		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
123
		bootstrap || die "sed failed"
124
125
	# Add gcc libs to the default link paths
126
	sed -i \
127
		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
128
		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
129
		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
130
131
	cmake_src_bootstrap
132
}
133
134
src_configure() {
135
	local mycmakeargs=(
136
		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
137
		-DCMAKE_USE_SYSTEM_LIBRARY_JSONCPP=$(usex system-jsoncpp)
138
		-DCMAKE_INSTALL_PREFIX="${EPREFIX}"/usr
139
		-DCMAKE_DOC_DIR=/share/doc/${PF}
140
		-DCMAKE_MAN_DIR=/share/man
141
		-DCMAKE_DATA_DIR=/share/${PN}
142
		-DSPHINX_MAN=$(usex doc)
143
		-DSPHINX_HTML=$(usex doc)
144
		$(cmake-utils_use_build ncurses CursesDialog)
145
	)
146
147
	if use qt4 || use qt5 ; then
148
		mycmakeargs+=(
149
			-DBUILD_QtDialog=ON
150
			$(cmake-utils_use_find_package qt5 Qt5Widgets)
151
		)
152
	fi
153
154
	cmake-utils_src_configure
155
}
156
157
src_compile() {
158
	cmake-utils_src_compile
159
	use emacs && elisp-compile Auxiliary/cmake-mode.el
160
}
161
162
src_test() {
163
	VIRTUALX_COMMAND="cmake_src_test" virtualmake
164
}
165
166
src_install() {
167
	cmake-utils_src_install
168
169
	if use emacs; then
170
		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
171
		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
172
	fi
173
174
	insinto /usr/share/vim/vimfiles/syntax
175
	doins Auxiliary/cmake-syntax.vim
176
177
	insinto /usr/share/vim/vimfiles/indent
178
	doins Auxiliary/cmake-indent.vim
179
180
	insinto /usr/share/vim/vimfiles/ftdetect
181
	doins "${FILESDIR}/${PN}.vim"
182
183
	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
184
185
	rm -rf "${D}"/usr/share/cmake/{completions,editors} || die
186
}
187
188
pkg_postinst() {
189
	use emacs && elisp-site-regen
190
}
191
192
pkg_postrm() {
193
	use emacs && elisp-site-regen
194
}
(-)a/dev-util/cmake/files/50cmake-gentoo.el (+4 lines)
Line 0 Link Here
1
(add-to-list 'load-path "@SITELISP@")
2
(autoload 'cmake-mode "cmake-mode" "Major mode for editing CMake files." t)
3
(add-to-list 'auto-mode-alist '("CMakeLists\\.txt\\'" . cmake-mode))
4
(add-to-list 'auto-mode-alist '("\\.cmake\\'" . cmake-mode))
(-)a/dev-util/cmake/files/cmake-2.6.3-no-duplicates-in-rpath.patch (+23 lines)
Line 0 Link Here
1
http://public.kitware.com/Bug/view.php?id=7933
2
3
diff -ur cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx cmake-2.6.2-p/Source/kwsys/kwsysPlatformTestsCXX.cxx
4
--- cmake-2.6.2/Source/kwsys/kwsysPlatformTestsCXX.cxx	Wed Sep 24 20:34:37 2008
Line 0 Link Here
1
Patch by Heiko Przybyl
2
3
--- Source/cmComputeLinkInformation.cxx
4
+++ Source/cmComputeLinkInformation.cxx
5
@@ -1686,6 +1686,14 @@ std::string cmComputeLinkInformation::Ge
6
   for(std::vector<std::string>::const_iterator ri = runtimeDirs.begin();
7
       ri != runtimeDirs.end(); ++ri)
8
     {
9
+      // Do not add duplicates.
10
+      // I'd like to have that check already in the list generation code
11
+      // but that would need lots of more changes, even in ExpandListArgument().
12
+      if(*sep != '\0' && (rpath + sep).find(*ri + sep) != std::string::npos)
13
+        {
14
+          //std::cerr << "ignoring duplicate: '" << *ri << "' in '" << rpath << "'" << std::endl;
15
+          continue;
16
+        }
17
     // Separate from previous path.
18
     rpath += sep;
19
     sep = this->GetRuntimeSep().c_str();
(-)a/dev-util/cmake/files/cmake-2.8.10-darwin-bundle.patch (+23 lines)
Line 0 Link Here
1
Don't use .so for modules on darwin/macos. Use .bundle instead.
2
Patch by Heiko Przybyl
3
4
--- Modules/Platform/Darwin.cmake
5
+++ Modules/Platform/Darwin.cmake
6
@@ -26,7 +26,7 @@
7
 set(CMAKE_SHARED_LIBRARY_PREFIX "lib")
8
 set(CMAKE_SHARED_LIBRARY_SUFFIX ".dylib")
9
 set(CMAKE_SHARED_MODULE_PREFIX "lib")
10
-set(CMAKE_SHARED_MODULE_SUFFIX ".so")
11
+set(CMAKE_SHARED_MODULE_SUFFIX ".bundle")
12
 set(CMAKE_MODULE_EXISTS 1)
13
 set(CMAKE_DL_LIBS "")
14
 
15
@@ -48,7 +48,7 @@
16
 set(CMAKE_SHARED_MODULE_CREATE_C_FLAGS "-bundle -Wl,-headerpad_max_install_names")
17
 set(CMAKE_SHARED_MODULE_LOADER_C_FLAG "-Wl,-bundle_loader,")
18
 set(CMAKE_SHARED_MODULE_LOADER_CXX_FLAG "-Wl,-bundle_loader,")
19
-set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".so" ".a")
20
+set(CMAKE_FIND_LIBRARY_SUFFIXES ".dylib" ".bundle" ".a")
21
 
22
 # hack: if a new cmake (which uses CMAKE_INSTALL_NAME_TOOL) runs on an old build tree
23
 # (where install_name_tool was hardcoded) and where CMAKE_INSTALL_NAME_TOOL isn't in the cache
(-)a/dev-util/cmake/files/cmake-2.8.10-darwin-isysroot.patch (+50 lines)
Line 0 Link Here
1
Do not detect Xcode and set -isysroot for its SDK, since that messes up
2
our toolchain, and hence makes any compilation fail, bug #445308
3
4
--- Modules/Platform/Darwin.cmake
5
+++ Modules/Platform/Darwin.cmake
6
@@ -60,18 +60,18 @@
7
 endif()
8
 
9
 # Ask xcode-select where to find /Developer or fall back to ancient location.
10
-execute_process(COMMAND xcode-select -print-path
11
-  OUTPUT_VARIABLE _stdout
12
-  OUTPUT_STRIP_TRAILING_WHITESPACE
13
-  ERROR_VARIABLE _stderr
14
-  RESULT_VARIABLE _failed)
15
-if(NOT _failed AND IS_DIRECTORY ${_stdout})
16
-  set(OSX_DEVELOPER_ROOT ${_stdout})
17
-elseif(IS_DIRECTORY "/Developer")
18
-  set(OSX_DEVELOPER_ROOT "/Developer")
19
-else()
20
+#execute_process(COMMAND xcode-select -print-path
21
+#  OUTPUT_VARIABLE _stdout
22
+#  OUTPUT_STRIP_TRAILING_WHITESPACE
23
+#  ERROR_VARIABLE _stderr
24
+#  RESULT_VARIABLE _failed)
25
+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
26
+#  set(OSX_DEVELOPER_ROOT ${_stdout})
27
+#elseif(IS_DIRECTORY "/Developer")
28
+#  set(OSX_DEVELOPER_ROOT "/Developer")
29
+#else()
30
   set(OSX_DEVELOPER_ROOT "")
31
-endif()
32
+#endif()
33
 
34
 execute_process(COMMAND sw_vers -productVersion
35
   OUTPUT_VARIABLE CURRENT_OSX_VERSION
36
@@ -91,10 +91,10 @@
37
 # CMAKE_OSX_DEPLOYMENT_TARGET
38
 
39
 # Set cache variable - end user may change this during ccmake or cmake-gui configure.
40
-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
41
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
42
-    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
43
-endif()
44
+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
45
+#  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
46
+#    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
47
+#endif()
48
 
49
 #----------------------------------------------------------------------------
50
 # CMAKE_OSX_SYSROOT
(-)a/dev-util/cmake/files/cmake-2.8.10-desktop.patch (+13 lines)
Line 0 Link Here
1
diff --git a/Source/QtDialog/CMake.desktop b/Source/QtDialog/CMake.desktop
2
index 645eb76..7be495f 100644
3
--- a/Source/QtDialog/CMake.desktop
4
+++ b/Source/QtDialog/CMake.desktop
5
@@ -3,7 +3,7 @@ Version=1.0
6
 Name=CMake
7
 Comment=Cross-platform buildsystem
8
 Exec=cmake-gui %f
9
-Icon=CMakeSetup32.png
10
+Icon=CMakeSetup32
11
 Terminal=false
12
 X-MultipleArgs=false
13
 Type=Application
(-)a/dev-util/cmake/files/cmake-2.8.10-libform.patch (+51 lines)
Line 0 Link Here
1
diff --git a/CMakeLists.txt b/CMakeLists.txt
2
index ea1c033..ae479ce 100644
3
--- a/CMakeLists.txt
4
+++ b/CMakeLists.txt
5
@@ -395,9 +395,6 @@ macro (CMAKE_BUILD_UTILITIES)
6
   else ()
7
     set(BUILD_CursesDialog 0)
8
   endif ()
9
-  if(BUILD_CursesDialog)
10
-    add_subdirectory(Source/CursesDialog/form)
11
-  endif()
12
 endmacro ()
13
 
14
 #-----------------------------------------------------------------------
15
diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
16
index 96e28b4..4102379 100644
17
--- a/Source/CursesDialog/CMakeLists.txt
18
+++ b/Source/CursesDialog/CMakeLists.txt
19
@@ -25,13 +25,16 @@ set( CURSES_SRCS
20
               CursesDialog/ccmake
21
    )
22
 
23
-include_directories(${CMake_SOURCE_DIR}/Source/CursesDialog/form
24
-                    ${CMake_BINARY_DIR}/Source/CursesDialog/form)
25
 include_directories(${CURSES_INCLUDE_PATH})
26
 
27
 
28
 add_executable(ccmake ${CURSES_SRCS} )
29
 target_link_libraries(ccmake CMakeLib)
30
-target_link_libraries(ccmake cmForm)
31
+TARGET_LINK_LIBRARIES(ccmake form)
32
+TARGET_LINK_LIBRARIES(ccmake ${CURSES_LIBRARY})
33
+IF(CURSES_EXTRA_LIBRARY)
34
+  TARGET_LINK_LIBRARIES(ccmake ${CURSES_EXTRA_LIBRARY})
35
+ENDIF(CURSES_EXTRA_LIBRARY)
36
+
37
 
38
 install_targets(/bin ccmake)
39
diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
40
index b157a28..f131ea4 100644
41
--- a/Source/CursesDialog/cmCursesStandardIncludes.h
42
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
43
@@ -15,8 +15,6 @@
44
  #define _MSE_INT_H
45
 #endif
46
 
47
-#include <cmFormConfigure.h>
48
-
49
 #if defined(__hpux)
50
 # define _BOOL_DEFINED
51
 # include <sys/time.h>
(-)a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonInterp.patch (+22 lines)
Line 0 Link Here
1
--- Modules/FindPythonInterp.cmake
2
+++ Modules/FindPythonInterp.cmake
3
@@ -60,6 +60,10 @@
4
 
5
 list(APPEND _Python_NAMES python)
6
 
7
+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
8
+    set(_Python_NAMES python)
9
+endif()
10
+
11
 # Search for the current active python version first
12
 find_program(PYTHON_EXECUTABLE NAMES ${_Python_NAMES})
13
 
14
@@ -76,7 +80,7 @@
15
 unset(_PYTHON3_VERSIONS)
16
 
17
 # Search for newest python version if python executable isn't found
18
-if(NOT PYTHON_EXECUTABLE)
19
+if(NOT PYTHON_EXECUTABLE AND NOT CMAKE_BUILD_TYPE STREQUAL Gentoo)
20
     foreach(_CURRENT_VERSION ${_Python_VERSIONS})
21
       set(_Python_NAMES python${_CURRENT_VERSION})
22
       if(WIN32)
(-)a/dev-util/cmake/files/cmake-2.8.10.2-FindPythonLibs.patch (+24 lines)
Line 0 Link Here
1
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
2
index bffa9fb..8fc90ee 100644
3
--- a/Modules/FindPythonLibs.cmake
4
+++ b/Modules/FindPythonLibs.cmake
5
@@ -74,6 +74,19 @@ set(_Python_VERSIONS
6
   ${_PYTHON_FIND_OTHER_VERSIONS}
7
   )
8
 
9
+# Gentoo portage requires that you use exactly the given python version
10
+if (CMAKE_BUILD_TYPE STREQUAL Gentoo)
11
+    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join([str(x) for x in sys.version_info[:2]]))"
12
+                    OUTPUT_VARIABLE _Gentoo_Python_VERSION)
13
+    list(FIND _Python_VERSIONS "${_Gentoo_Python_VERSION}" _Gentoo_Python_INDEX)
14
+    if (_Gentoo_Python_INDEX EQUAL -1)
15
+       # the current Gentoo python version is not compatible with what is requested
16
+       set(_Python_VERSIONS)
17
+    else ()
18
+       set(_Python_VERSIONS "${_Gentoo_Python_VERSION}")
19
+    endif ()
20
+endif()
21
+
22
 unset(_PYTHON_FIND_OTHER_VERSIONS)
23
 unset(_PYTHON1_VERSIONS)
24
 unset(_PYTHON2_VERSIONS)
(-)a/dev-util/cmake/files/cmake-2.8.11-FindBLAS.patch (+48 lines)
Line 0 Link Here
1
--- b/Modules/FindBLAS.cmake
2
+++ a/Modules/FindBLAS.cmake
3
@@ -1,3 +1,9 @@
4
+#
5
+# Version modified for Gentoo Linux
6
+# If a valid PkgConfig configuration for blas is found, this overrides and cancels
7
+# all further checks.
8
+#
9
+
10
 # - Find BLAS library
11
 # This module finds an installed fortran library that implements the BLAS
12
 # linear-algebra interface (see http://www.netlib.org/blas/).
13
@@ -40,6 +46,26 @@
14
 # (To distribute this file outside of CMake, substitute the full
15
 #  License text for the above reference.)
16
 
17
+#
18
+# first, try PkgConfig
19
+#
20
+find_package(PkgConfig REQUIRED)
21
+pkg_check_modules(PC_BLAS blas)
22
+if(PC_BLAS_FOUND)
23
+  foreach(PC_LIB ${PC_BLAS_LIBRARIES})
24
+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
25
+    if (NOT ${PC_LIB}_LIBRARY)
26
+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
27
+    endif (NOT ${PC_LIB}_LIBRARY)
28
+    list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) 
29
+  endforeach(PC_LIB)
30
+  find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
31
+  mark_as_advanced(BLAS_LIBRARIES)
32
+else(PC_BLAS_FOUND)
33
+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
34
+
35
+
36
+
37
 include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
38
 include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
39
 
40
@@ -604,3 +630,8 @@
41
 endif()
42
 
43
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
44
+
45
+
46
+endif(PC_BLAS_FOUND)
47
+
48
+
(-)a/dev-util/cmake/files/cmake-2.8.11-FindBoost-python.patch (+73 lines)
Line 0 Link Here
1
--- Modules/FindBoost.cmake
2
+++ Modules/FindBoost.cmake
3
@@ -903,6 +903,11 @@
4
 
5
   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
6
   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
7
+  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
8
+    # Get version of Python.
9
+    execute_process(COMMAND python -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
10
+  endif()
11
+
12
 
13
   #
14
   # Find RELEASE libraries
15
@@ -913,6 +918,14 @@
16
     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
17
     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
18
     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
19
+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
20
+      list(APPEND _boost_RELEASE_NAMES
21
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
22
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
23
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
24
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
25
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
26
+    endif()
27
   if(_boost_STATIC_RUNTIME_WORKAROUND)
28
     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
29
     list(APPEND _boost_RELEASE_NAMES
30
@@ -920,6 +933,13 @@
31
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
32
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
33
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
34
+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
35
+        list(APPEND _boost_RELEASE_NAMES
36
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
37
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
38
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
39
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
40
+      endif()
41
   endif()
42
   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
43
      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
44
@@ -945,6 +965,15 @@
45
     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
46
     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
47
     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
48
+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
49
+      list(APPEND _boost_DEBUG_NAMES
50
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
51
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
52
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
53
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
54
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
55
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
56
+    endif()
57
   if(_boost_STATIC_RUNTIME_WORKAROUND)
58
     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
59
     list(APPEND _boost_DEBUG_NAMES
60
@@ -952,6 +981,13 @@
61
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
62
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
63
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
64
+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
65
+        list(APPEND _boost_DEBUG_NAMES
66
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
67
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
68
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
69
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
70
+      endif()
71
   endif()
72
   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
73
      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
(-)a/dev-util/cmake/files/cmake-2.8.11-more-no_host_paths.patch (+130 lines)
Line 0 Link Here
1
From 65571942d4f19d508174f6f89aeaac5ffe380a6e Mon Sep 17 00:00:00 2001
2
From: Michael Palimaka <kensington@gentoo.org>
3
Date: Tue, 6 Nov 2012 23:35:34 +1100
4
Subject: [PATCH] Set some proper paths to make cmake find our tools.
5
6
The ebuild now adds an extra / at the end of $EPREFIX so that it is
7
never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
8
correct)
9
10
Original patch by Heiko Przybyl.
11
Updated by Chris Reffett (cmake-2.8.8)
12
Updated by Johannes Huber (cmake-2.8.9)
13
Updated by Michael Palimaka (cmake-2.8.10)
14
Updated by Chris Reffett (cmake-2.8.11)
15
16
--- a/Modules/Platform/Darwin.cmake
17
+++ b/Modules/Platform/Darwin.cmake
18
@@ -252,9 +252,9 @@
19
       "<CMAKE_CXX_COMPILER> <LANGUAGE_COMPILE_FLAGS> <CMAKE_SHARED_LIBRARY_CREATE_CXX_FLAGS> <LINK_FLAGS> -o <TARGET> <SONAME_FLAG> <TARGET_INSTALLNAME_DIR><TARGET_SONAME> <OBJECTS> <LINK_LIBRARIES>")
20
 
21
 
22
-# default to searching for frameworks first
23
+# default to searching for frameworks last
24
 if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
25
-  set(CMAKE_FIND_FRAMEWORK FIRST)
26
+  set(CMAKE_FIND_FRAMEWORK LAST)
27
 endif()
28
 
29
 # Older OS X linkers do not report their framework search path
30
@@ -276,6 +276,8 @@
31
 
32
 # set up the default search directories for frameworks
33
 set(CMAKE_SYSTEM_FRAMEWORK_PATH
34
+  @GENTOO_PORTAGE_EPREFIX@Frameworks
35
+  @GENTOO_PORTAGE_EPREFIX@usr/lib
36
   ~/Library/Frameworks
37
   /Library/Frameworks
38
   /Network/Library/Frameworks
39
@@ -298,13 +300,15 @@
40
   endif()
41
 endif()
42
 
43
-# default to searching for application bundles first
44
+# default to searching for application bundles last
45
 if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
46
-  set(CMAKE_FIND_APPBUNDLE FIRST)
47
+  set(CMAKE_FIND_APPBUNDLE LAST)
48
 endif()
49
 # set up the default search directories for application bundles
50
 set(_apps_paths)
51
 foreach(_path
52
+  @GENTOO_PORTAGE_EPREFIX@Applications
53
+  @GENTOO_PORTAGE_EPREFIX@usr/bin
54
   "~/Applications"
55
   "/Applications"
56
   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
57
--- a/Modules/Platform/UnixPaths.cmake
58
+++ b/Modules/Platform/UnixPaths.cmake
59
@@ -33,6 +33,7 @@
60
 # search types.
61
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
62
   # Standard
63
+  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
64
   /usr/local /usr /
65
 
66
   # CMake install location
67
@@ -44,43 +45,41 @@
68
 
69
 # List common include file locations not under the common prefixes.
70
 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
71
-  # Windows API on Cygwin
72
-  /usr/include/w32api
73
-
74
-  # X11
75
-  /usr/X11R6/include /usr/include/X11
76
-
77
-  # Other
78
-  /usr/pkg/include
79
-  /opt/csw/include /opt/include
80
-  /usr/openwin/include
81
+  @GENTOO_PORTAGE_EPREFIX@usr/include
82
   )
83
 
84
 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
85
-  # Windows API on Cygwin
86
-  /usr/lib/w32api
87
-
88
-  # X11
89
-  /usr/X11R6/lib /usr/lib/X11
90
-
91
-  # Other
92
-  /usr/pkg/lib
93
-  /opt/csw/lib /opt/lib
94
-  /usr/openwin/lib
95
+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
96
+  @GENTOO_PORTAGE_GCCLIBDIR@
97
+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
98
+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
99
+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
100
+  @GENTOO_PORTAGE_EPREFIX@usr/lib
101
+  @GENTOO_PORTAGE_EPREFIX@lib
102
   )
103
 
104
 list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
105
-  /usr/pkg/bin
106
+  @GENTOO_PORTAGE_EPREFIX@usr/bin
107
+  @GENTOO_PORTAGE_EPREFIX@bin
108
   )
109
 
110
 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
111
-  /lib /usr/lib /usr/lib32 /usr/lib64
112
+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
113
+  @GENTOO_PORTAGE_GCCLIBDIR@
114
+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
115
+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
116
+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
117
+  @GENTOO_PORTAGE_EPREFIX@usr/lib
118
+  @GENTOO_PORTAGE_EPREFIX@lib
119
+  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
120
   )
121
 
122
 list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
123
+  @GENTOO_PORTAGE_EPREFIX@usr/include
124
   /usr/include
125
   )
126
 list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
127
+  @GENTOO_PORTAGE_EPREFIX@usr/include
128
   /usr/include
129
   )
130
 
(-)a/dev-util/cmake/files/cmake-2.8.12.1-FindFreetype.patch (+43 lines)
Line 0 Link Here
1
From: Julian Ospald <hasufell@gentoo.org>
2
Date: Sun Dec  8 13:38:06 UTC 2013
3
Subject: fix check for freetype-2.5.1
4
5
--- Modules/FindFreetype.cmake
6
+++ Modules/FindFreetype.cmake
7
@@ -64,6 +64,19 @@
8
   PATH_SUFFIXES include/freetype2 include
9
 )
10
 
11
+if(NOT FREETYPE_INCLUDE_DIR_freetype2)
12
+  find_path(FREETYPE_INCLUDE_DIR_freetype2 config/ftheader.h
13
+    HINTS
14
+      ENV FREETYPE_DIR
15
+    PATHS
16
+      /usr/X11R6
17
+      /usr/local/X11R6
18
+      /usr/local/X11
19
+      /usr/freeware
20
+    PATH_SUFFIXES include/freetype2 include
21
+  )
22
+endif()
23
+
24
 find_library(FREETYPE_LIBRARY
25
   NAMES freetype libfreetype freetype219
26
   HINTS
27
@@ -82,8 +95,14 @@
28
 endif()
29
 set(FREETYPE_LIBRARIES "${FREETYPE_LIBRARY}")
30
 
31
-if(FREETYPE_INCLUDE_DIR_freetype2 AND EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
32
-    file(STRINGS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h" freetype_version_str
33
+if(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
34
+  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype/freetype.h")
35
+elseif(EXISTS "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
36
+  set(FREETYPE_H "${FREETYPE_INCLUDE_DIR_freetype2}/freetype.h")
37
+endif()
38
+
39
+if(FREETYPE_INCLUDE_DIR_freetype2 AND FREETYPE_H)
40
+    file(STRINGS "${FREETYPE_H}" freetype_version_str
41
          REGEX "^#[\t ]*define[\t ]+FREETYPE_(MAJOR|MINOR|PATCH)[\t ]+[0-9]+$")
42
 
43
     unset(FREETYPE_VERSION_STRING)
(-)a/dev-util/cmake/files/cmake-2.8.12.1-FindImageMagick.patch (+23 lines)
Line 0 Link Here
1
--- Modules/FindImageMagick.cmake
2
+++ Modules/FindImageMagick.cmake
3
@@ -147,17 +147,17 @@
4
     )
5
   if(component STREQUAL "Magick++")
6
     FIND_IMAGEMAGICK_API(Magick++ Magick++.h
7
-      Magick++ CORE_RL_Magick++_ Magick++-6.Q16 Magick++-Q16 Magick++-6.Q8 Magick++-Q8 Magick++-6.Q16HDRI Magick++-Q16HDRI Magick++-6.Q8HDRI Magick++-Q8HDRI
8
+      Magick++ CORE_RL_Magick++_ Magick++-6.Q64 Magick++-6.Q64HDRI Magick++-6.Q32 Magick++-6.Q32HDRI Magick++-6.Q16 Magick++-6.Q16HDRI Magick++-6.Q8 Magick++-6.Q8HDRI
9
       )
10
     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_Magick++_LIBRARY)
11
   elseif(component STREQUAL "MagickWand")
12
     FIND_IMAGEMAGICK_API(MagickWand wand/MagickWand.h
13
-      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q16 MagickWand-Q16 MagickWand-6.Q8 MagickWand-Q8 MagickWand-6.Q16HDRI MagickWand-Q16HDRI MagickWand-6.Q8HDRI MagickWand-Q8HDRI
14
+      Wand MagickWand CORE_RL_wand_ MagickWand-6.Q64 MagickWand-6.Q64HDRI MagickWand-6.Q32 MagickWand-6.Q32HDRI MagickWand-6.Q16 MagickWand-6.Q16HDRI MagickWand-6.Q8 MagickWand-6.Q8HDRI
15
       )
16
     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickWand_LIBRARY)
17
   elseif(component STREQUAL "MagickCore")
18
     FIND_IMAGEMAGICK_API(MagickCore magick/MagickCore.h
19
-      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q16 MagickCore-Q16 MagickCore-6.Q8 MagickCore-Q8 MagickCore-6.Q16HDRI MagickCore-Q16HDRI MagickCore-6.Q8HDRI MagickCore-Q8HDRI
20
+      Magick MagickCore CORE_RL_magick_ MagickCore-6.Q64 MagickCore-6.Q64HDRI MagickCore-6.Q32 MagickCore-6.Q32HDRI MagickCore-6.Q16 MagickCore-6.Q16HDRI MagickCore-6.Q8 MagickCore-6.Q8HDRI
21
       )
22
     list(APPEND ImageMagick_REQUIRED_VARS ImageMagick_MagickCore_LIBRARY)
23
   else()
(-)a/dev-util/cmake/files/cmake-2.8.12.2-FindBoost-python.patch (+77 lines)
Line 0 Link Here
1
--- Modules/FindBoost.cmake
2
+++ Modules/FindBoost.cmake
3
@@ -905,6 +905,15 @@
4
 
5
   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
6
   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
7
+  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
8
+    # Get version of Python.
9
+    if (NOT PYTHON_EXECUTABLE)
10
+      #if a certain version of python was detected by cmake before use that one
11
+        set(PYTHON_EXECUTABLE "python")
12
+      endif (NOT PYTHON_EXECUTABLE)
13
+    execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
14
+  endif()
15
+
16
 
17
   #
18
   # Find RELEASE libraries
19
@@ -915,6 +924,14 @@
20
     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
21
     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
22
     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
23
+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
24
+      list(APPEND _boost_RELEASE_NAMES
25
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
26
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
27
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
28
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
29
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
30
+    endif()
31
   if(_boost_STATIC_RUNTIME_WORKAROUND)
32
     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
33
     list(APPEND _boost_RELEASE_NAMES
34
@@ -922,6 +939,13 @@
35
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
36
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
37
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
38
+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
39
+        list(APPEND _boost_RELEASE_NAMES
40
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
41
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
42
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
43
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
44
+      endif()
45
   endif()
46
   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
47
      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
48
@@ -951,6 +975,15 @@
49
     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
50
     ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}
51
     ${Boost_LIB_PREFIX}boost_${COMPONENT} )
52
+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
53
+      list(APPEND _boost_DEBUG_NAMES
54
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
55
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
56
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
57
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
58
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
59
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
60
+    endif()
61
   if(_boost_STATIC_RUNTIME_WORKAROUND)
62
     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
63
     list(APPEND _boost_DEBUG_NAMES
64
@@ -958,6 +991,13 @@
65
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
66
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
67
       ${Boost_LIB_PREFIX}boost_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
68
+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
69
+        list(APPEND _boost_DEBUG_NAMES
70
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
71
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
72
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
73
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
74
+      endif()
75
   endif()
76
   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
77
      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
(-)a/dev-util/cmake/files/cmake-2.8.12.2-fbsd.patch (+39 lines)
Line 0 Link Here
1
--- cmake-2.8.12.1-orig/Modules/FindCurses.cmake	2013-11-06 06:07:22.000000000 +1100
Line 0 Link Here
1
From: KWSys Robot <kwrobot@kitware.com>
2
Date: Tue, 15 Oct 2013 12:43:32 +0000 (-0400)
3
Subject: KWSys 2013-10-15 (6eab64c3)
4
X-Git-Tag: v3.0.0-rc1~178^2^2~5
5
X-Git-Url: http://cmake.org/gitweb?p=cmake.git;a=commitdiff_plain;h=c01e7445
6
7
KWSys 2013-10-15 (6eab64c3)
8
9
Extract upstream KWSys using the following shell commands.
10
11
$ git archive --prefix=upstream-kwsys/ 6eab64c3 | tar x
12
$ git shortlog --no-merges --abbrev=8 --format='%h %s' 96b2f6f4..6eab64c3
13
Raphael Kubo da Costa (1):
14
      6eab64c3 SystemInformation: Include backtrace-related headers on FreeBSD
15
16
Change-Id: Ib0447aab3d6555ce278f0c1417af2c53e6f181a5
17
---
18
19
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx
20
index 7c31f3a..2672730 100644
21
--- a/Source/kwsys/SystemInformation.cxx
22
+++ b/Source/kwsys/SystemInformation.cxx
23
@@ -88,6 +88,15 @@ typedef int siginfo_t;
24
 #  include <ifaddrs.h>
25
 #  define KWSYS_SYSTEMINFORMATION_IMPLEMENT_FQDN
26
 # endif
27
+# if defined(KWSYS_SYSTEMINFORMATION_HAS_BACKTRACE)
28
+#  include <execinfo.h>
29
+#  if defined(KWSYS_SYSTEMINFORMATION_HAS_CPP_DEMANGLE)
30
+#    include <cxxabi.h>
31
+#  endif
32
+#  if defined(KWSYS_SYSTEMINFORMATION_HAS_SYMBOL_LOOKUP)
33
+#    include <dlfcn.h>
34
+#  endif
35
+# endif
36
 #endif
37
 
38
 #if defined(__OpenBSD__) || defined(__NetBSD__)
(-)a/dev-util/cmake/files/cmake-2.8.12.2-hppa-bootstrap.patch (+27 lines)
Line 0 Link Here
1
diff --git a/CompileFlags.cmake b/CompileFlags.cmake
2
index 20f5dec..24ac58d 100644
3
--- a/CompileFlags.cmake
4
+++ b/CompileFlags.cmake
5
@@ -66,5 +66,5 @@ endif ()
6
 # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
7
 # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
8
 if (CMAKE_SYSTEM_NAME STREQUAL Linux AND CMAKE_SYSTEM_PROCESSOR STREQUAL parisc)
9
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text.*")
10
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--unique=.text._*")
11
 endif ()
12
diff --git a/bootstrap b/bootstrap
13
index 9784d5d..51d067e 100755
14
--- a/bootstrap
15
+++ b/bootstrap
16
@@ -692,10 +692,7 @@ if ${cmake_system_linux}; then
17
   # avoid binutils problem with large binaries, e.g. when building CMake in debug mode
18
   # See http://gcc.gnu.org/bugzilla/show_bug.cgi?id=50230
19
   if ${cmake_machine_parisc}; then
20
-    # if -O[s23] is given the effect is inverted, so do not use the flag then
21
-    if [ "`echo "${CXXFLAGS}" | sed -r '/^(.* )?(-O[s234])( .*)?$/s/.*/-Os/'`" != "-Os" ]; then
22
-      cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text.*"
23
-    fi
24
+    cmake_ld_flags="${LDFLAGS} -Wl,--unique=.text._*"
25
   fi
26
 fi
27
 
(-)a/dev-util/cmake/files/cmake-2.8.12.2-python34.patch (+34 lines)
Line 0 Link Here
1
commit ab6201ab647c13fee44c44822b8502e9848faaaf
2
Author: Matt McCormick <matt.mccormick@kitware.com>
3
Date:   Wed Mar 5 17:41:47 2014 -0500
4
5
    FindPython{Interp,Libs}: Search for Python 3.4.
6
    
7
    Python 3.4.0rnc1 was released on 2014-02-20.
8
9
diff --git a/Modules/FindPythonInterp.cmake b/Modules/FindPythonInterp.cmake
10
index 8da848c..e23a58b 100644
11
--- a/Modules/FindPythonInterp.cmake
12
+++ b/Modules/FindPythonInterp.cmake
13
@@ -47,7 +47,7 @@ unset(_Python_NAMES)
14
 
15
 set(_PYTHON1_VERSIONS 1.6 1.5)
16
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
17
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
18
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
19
 
20
 if(PythonInterp_FIND_VERSION)
21
     if(PythonInterp_FIND_VERSION_COUNT GREATER 1)
22
diff --git a/Modules/FindPythonLibs.cmake b/Modules/FindPythonLibs.cmake
23
index 0749efc..1dbc967 100644
24
--- a/Modules/FindPythonLibs.cmake
25
+++ b/Modules/FindPythonLibs.cmake
26
@@ -51,7 +51,7 @@ CMAKE_FIND_FRAMEWORKS(Python)
27
 
28
 set(_PYTHON1_VERSIONS 1.6 1.5)
29
 set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0)
30
-set(_PYTHON3_VERSIONS 3.3 3.2 3.1 3.0)
31
+set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0)
32
 
33
 if(PythonLibs_FIND_VERSION)
34
     if(PythonLibs_FIND_VERSION_COUNT GREATER 1)
(-)a/dev-util/cmake/files/cmake-2.8.8-FindPkgConfig.patch (+20 lines)
Line 0 Link Here
1
diff -ruN cmake-2.8.7.orig/Modules/FindLAPACK.cmake cmake-2.8.7/Modules/FindLAPACK.cmake
2
--- cmake-2.8.7.orig/Modules/FindLAPACK.cmake	2011-12-30 17:49:56.000000000 +0100
Line 0 Link Here
1
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
2
index c47f583..5783d37 100644
3
--- a/Modules/FindPkgConfig.cmake
4
+++ b/Modules/FindPkgConfig.cmake
5
@@ -87,7 +87,12 @@
6
 set(PKG_CONFIG_VERSION 1)
7
 set(PKG_CONFIG_FOUND   0)
8
 
9
-find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
10
+if(NOT PKG_CONFIG_EXECUTABLE)
11
+	set(PKG_CONFIG_EXECUTABLE $ENV{PKG_CONFIG})
12
+	if(NOT PKG_CONFIG_EXECUTABLE)
13
+		find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
14
+	endif(NOT PKG_CONFIG_EXECUTABLE)
15
+endif(NOT PKG_CONFIG_EXECUTABLE)
16
 mark_as_advanced(PKG_CONFIG_EXECUTABLE)
17
 
18
 if(PKG_CONFIG_EXECUTABLE)
(-)a/dev-util/cmake/files/cmake-3.0.0-FindBLAS.patch (+43 lines)
Line 0 Link Here
1
--- Modules/FindBLAS.cmake
2
+++ Modules/FindBLAS.cmake
3
@@ -4,6 +4,10 @@
4
 #
5
 # Find BLAS library
6
 #
7
+# Version modified for Gentoo Linux.
8
+# If a valid PkgConfig configuration is found, this overrides and cancels
9
+# all further checks.
10
+#
11
 # This module finds an installed fortran library that implements the
12
 # BLAS linear-algebra interface (see http://www.netlib.org/blas/).  The
13
 # list of libraries searched for is taken from the autoconf macro file,
14
@@ -50,6 +54,23 @@
15
 # (To distribute this file outside of CMake, substitute the full
16
 #  License text for the above reference.)
17
 
18
+# first, try PkgConfig
19
+#
20
+find_package(PkgConfig REQUIRED)
21
+pkg_check_modules(PC_BLAS blas)
22
+if(PC_BLAS_FOUND)
23
+  foreach(PC_LIB ${PC_BLAS_LIBRARIES})
24
+    find_library(${PC_LIB}_LIBRARY NAMES ${PC_LIB} HINTS ${PC_BLAS_LIBRARY_DIRS} )
25
+    if (NOT ${PC_LIB}_LIBRARY)
26
+      message(FATAL_ERROR "Something is wrong in your pkg-config file - lib ${PC_LIB} not found in ${PC_BLAS_LIBRARY_DIRS}")
27
+    endif (NOT ${PC_LIB}_LIBRARY)
28
+    list(APPEND BLAS_LIBRARIES ${${PC_LIB}_LIBRARY}) 
29
+  endforeach(PC_LIB)
30
+  find_package_handle_standard_args(BLAS DEFAULT_MSG BLAS_LIBRARIES)
31
+  mark_as_advanced(BLAS_LIBRARIES)
32
+else(PC_BLAS_FOUND)
33
+message(STATUS "No PkgConfig configuration for BLAS found; starting more extensive search.")
34
+
35
 include(${CMAKE_CURRENT_LIST_DIR}/CheckFunctionExists.cmake)
36
 include(${CMAKE_CURRENT_LIST_DIR}/CheckFortranFunctionExists.cmake)
37
 
38
@@ -688,3 +709,5 @@
39
 endif()
40
 
41
 set(CMAKE_FIND_LIBRARY_SUFFIXES ${_blas_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
42
+
43
+endif(PC_BLAS_FOUND)
(-)a/dev-util/cmake/files/cmake-3.0.0-FindBoost-python.patch (+93 lines)
Line 0 Link Here
1
From 934ec9add33d413e4d5c9cec1cb3ebb5cbfd81f4 Mon Sep 17 00:00:00 2001
2
From: Michael Palimaka <kensington@gentoo.org>
3
Date: Thu, 19 Jun 2014 00:17:48 +1000
4
Subject: [PATCH] Fix detection of PYTHON_ABI-versioned Boost Python libraries
5
 wrt bug #400969.
6
7
---
8
 Modules/FindBoost.cmake | 41 +++++++++++++++++++++++++++++++++++++++++
9
 1 file changed, 41 insertions(+)
10
11
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake
12
index dfd4460..70bfb4f 100644
13
--- a/Modules/FindBoost.cmake
14
+++ b/Modules/FindBoost.cmake
15
@@ -952,6 +952,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
16
   set( _boost_docstring_release "Boost ${COMPONENT} library (release)")
17
   set( _boost_docstring_debug   "Boost ${COMPONENT} library (debug)")
18
 
19
+  if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
20
+    # Get version of Python.
21
+    if (NOT PYTHON_EXECUTABLE)
22
+      #if a certain version of python was detected by cmake before use that one
23
+        set(PYTHON_EXECUTABLE "python")
24
+      endif (NOT PYTHON_EXECUTABLE)
25
+    execute_process(COMMAND "${PYTHON_EXECUTABLE}" -c "import sys; sys.stdout.write('.'.join(str(x) for x in sys.version_info[:2]))" OUTPUT_VARIABLE _python_version)
26
+  endif()
27
+
28
   # Compute component-specific hints.
29
   set(_Boost_FIND_LIBRARY_HINTS_FOR_COMPONENT "")
30
   if(${COMPONENT} STREQUAL "mpi" OR ${COMPONENT} STREQUAL "mpi_python" OR
31
@@ -984,6 +993,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
32
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
33
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
34
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
35
+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
36
+      list(APPEND _boost_RELEASE_NAMES
37
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
38
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
39
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}-${Boost_LIB_VERSION}
40
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_ABI_TAG}
41
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
42
+    endif()
43
+
44
   if(_boost_STATIC_RUNTIME_WORKAROUND)
45
     set(_boost_RELEASE_STATIC_ABI_TAG "-s${_boost_RELEASE_ABI_TAG}")
46
     list(APPEND _boost_RELEASE_NAMES
47
@@ -991,6 +1009,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
48
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
49
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
50
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
51
+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
52
+        list(APPEND _boost_RELEASE_NAMES
53
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
54
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}
55
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
56
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_RELEASE_STATIC_ABI_TAG} )
57
+      endif()
58
   endif()
59
   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
60
      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_RELEASE_NAMES ${_boost_RELEASE_NAMES})
61
@@ -1020,6 +1045,15 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
62
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
63
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}
64
     ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT} )
65
+    if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
66
+      list(APPEND _boost_DEBUG_NAMES
67
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
68
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
69
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}-${Boost_LIB_VERSION}
70
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_ABI_TAG}
71
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}
72
+        ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version} )
73
+    endif()
74
   if(_boost_STATIC_RUNTIME_WORKAROUND)
75
     set(_boost_DEBUG_STATIC_ABI_TAG "-s${_boost_DEBUG_ABI_TAG}")
76
     list(APPEND _boost_DEBUG_NAMES
77
@@ -1027,6 +1061,13 @@ foreach(COMPONENT ${Boost_FIND_COMPONENTS})
78
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
79
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
80
       ${Boost_LIB_PREFIX}${Boost_NAMESPACE}_${COMPONENT}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
81
+      if(${COMPONENT} STREQUAL "python" OR ${COMPONENT} STREQUAL "mpi_python")
82
+        list(APPEND _boost_DEBUG_NAMES
83
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
84
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_COMPILER}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}
85
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG}-${Boost_LIB_VERSION}
86
+          ${Boost_LIB_PREFIX}boost_${COMPONENT}-${_python_version}${_boost_MULTITHREADED}${_boost_DEBUG_STATIC_ABI_TAG} )
87
+      endif()
88
   endif()
89
   if(Boost_THREADAPI AND ${COMPONENT} STREQUAL "thread")
90
      _Boost_PREPEND_LIST_WITH_THREADAPI(_boost_DEBUG_NAMES ${_boost_DEBUG_NAMES})
91
-- 
92
1.8.5.5
93
(-)a/dev-util/cmake/files/cmake-3.0.0-prefix-dirs.patch (+142 lines)
Line 0 Link Here
1
From e7ce3e523f8cfa1bc749118f381753230766827f Mon Sep 17 00:00:00 2001
2
From: Michael Palimaka <kensington@gentoo.org>
3
Date: Thu, 19 Jun 2014 00:08:13 +1000
4
Subject: [PATCH] Set some proper paths to make cmake find our tools.
5
6
The ebuild now adds an extra / at the end of $EPREFIX so that it is
7
never the empty string (so that CMAKE_SYSTEM_PREFIX_PATH remains
8
correct)
9
10
Original patch by Heiko Przybyl.
11
Updated by Chris Reffett (cmake-2.8.8)
12
Updated by Johannes Huber (cmake-2.8.9)
13
Updated by Michael Palimaka (cmake-2.8.10)
14
Updated by Chris Reffett (cmake-2.8.11)
15
Updated by Michael Palimaka (cmake-3.0.0)
16
---
17
 Modules/Platform/Darwin.cmake    | 12 +++++++----
18
 Modules/Platform/UnixPaths.cmake | 43 ++++++++++++++++++++--------------------
19
 2 files changed, 29 insertions(+), 26 deletions(-)
20
21
diff --git a/Modules/Platform/Darwin.cmake b/Modules/Platform/Darwin.cmake
22
index e25df1e..9b22a6a 100644
23
--- a/Modules/Platform/Darwin.cmake
24
+++ b/Modules/Platform/Darwin.cmake
25
@@ -132,9 +132,9 @@ set(CMAKE_C_FRAMEWORK_SEARCH_FLAG -F)
26
 set(CMAKE_CXX_FRAMEWORK_SEARCH_FLAG -F)
27
 set(CMAKE_Fortran_FRAMEWORK_SEARCH_FLAG -F)
28
 
29
-# default to searching for frameworks first
30
+# default to searching for frameworks last
31
 if(NOT DEFINED CMAKE_FIND_FRAMEWORK)
32
-  set(CMAKE_FIND_FRAMEWORK FIRST)
33
+  set(CMAKE_FIND_FRAMEWORK LAST)
34
 endif()
35
 
36
 # Older OS X linkers do not report their framework search path
37
@@ -156,6 +156,8 @@ endif()
38
 
39
 # set up the default search directories for frameworks
40
 set(CMAKE_SYSTEM_FRAMEWORK_PATH
41
+  @GENTOO_PORTAGE_EPREFIX@Frameworks
42
+  @GENTOO_PORTAGE_EPREFIX@usr/lib
43
   ~/Library/Frameworks
44
   )
45
 if(_CMAKE_OSX_SYSROOT_PATH)
46
@@ -187,13 +189,15 @@ if(CMAKE_OSX_SYSROOT)
47
   endif()
48
 endif()
49
 
50
-# default to searching for application bundles first
51
+# default to searching for application bundles last
52
 if(NOT DEFINED CMAKE_FIND_APPBUNDLE)
53
-  set(CMAKE_FIND_APPBUNDLE FIRST)
54
+  set(CMAKE_FIND_APPBUNDLE LAST)
55
 endif()
56
 # set up the default search directories for application bundles
57
 set(_apps_paths)
58
 foreach(_path
59
+  @GENTOO_PORTAGE_EPREFIX@Applications
60
+  @GENTOO_PORTAGE_EPREFIX@usr/bin
61
   "~/Applications"
62
   "/Applications"
63
   "${OSX_DEVELOPER_ROOT}/../Applications" # Xcode 4.3+
64
diff --git a/Modules/Platform/UnixPaths.cmake b/Modules/Platform/UnixPaths.cmake
65
index 20ee1d1..3481ca8 100644
66
--- a/Modules/Platform/UnixPaths.cmake
67
+++ b/Modules/Platform/UnixPaths.cmake
68
@@ -33,6 +33,7 @@ get_filename_component(_CMAKE_INSTALL_DIR "${_CMAKE_INSTALL_DIR}" PATH)
69
 # search types.
70
 list(APPEND CMAKE_SYSTEM_PREFIX_PATH
71
   # Standard
72
+  @GENTOO_PORTAGE_EPREFIX@usr/local @GENTOO_PORTAGE_EPREFIX@usr @GENTOO_PORTAGE_EPREFIX@
73
   /usr/local /usr /
74
 
75
   # CMake install location
76
@@ -53,43 +54,41 @@ endif()
77
 
78
 # List common include file locations not under the common prefixes.
79
 list(APPEND CMAKE_SYSTEM_INCLUDE_PATH
80
-  # Windows API on Cygwin
81
-  /usr/include/w32api
82
-
83
-  # X11
84
-  /usr/X11R6/include /usr/include/X11
85
-
86
-  # Other
87
-  /usr/pkg/include
88
-  /opt/csw/include /opt/include
89
-  /usr/openwin/include
90
+  @GENTOO_PORTAGE_EPREFIX@usr/include
91
   )
92
 
93
 list(APPEND CMAKE_SYSTEM_LIBRARY_PATH
94
-  # Windows API on Cygwin
95
-  /usr/lib/w32api
96
-
97
-  # X11
98
-  /usr/X11R6/lib /usr/lib/X11
99
-
100
-  # Other
101
-  /usr/pkg/lib
102
-  /opt/csw/lib /opt/lib
103
-  /usr/openwin/lib
104
+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
105
+  @GENTOO_PORTAGE_GCCLIBDIR@
106
+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
107
+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
108
+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
109
+  @GENTOO_PORTAGE_EPREFIX@usr/lib
110
+  @GENTOO_PORTAGE_EPREFIX@lib
111
   )
112
 
113
 list(APPEND CMAKE_SYSTEM_PROGRAM_PATH
114
-  /usr/pkg/bin
115
+  @GENTOO_PORTAGE_EPREFIX@usr/bin
116
+  @GENTOO_PORTAGE_EPREFIX@bin
117
   )
118
 
119
 list(APPEND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES
120
-  /lib /lib32 /lib64 /usr/lib /usr/lib32 /usr/lib64
121
+  @GENTOO_PORTAGE_GCCLIBDIR@/gcc
122
+  @GENTOO_PORTAGE_GCCLIBDIR@
123
+  @GENTOO_PORTAGE_EPREFIX@usr/lib64
124
+  @GENTOO_PORTAGE_EPREFIX@usr/libx32
125
+  @GENTOO_PORTAGE_EPREFIX@usr/lib32
126
+  @GENTOO_PORTAGE_EPREFIX@usr/lib
127
+  @GENTOO_PORTAGE_EPREFIX@lib
128
+  /lib /usr/lib /usr/lib32 /usr/lib64 /usr/libx32
129
   )
130
 
131
 list(APPEND CMAKE_C_IMPLICIT_INCLUDE_DIRECTORIES
132
+  GENTOO_PORTAGE_EPREFIX@usr/include
133
   /usr/include
134
   )
135
 list(APPEND CMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES
136
+  @GENTOO_PORTAGE_EPREFIX@usr/include
137
   /usr/include
138
   )
139
 
140
-- 
141
1.8.5.5
142
(-)a/dev-util/cmake/files/cmake-3.1.0-darwin-isysroot.patch (+50 lines)
Line 0 Link Here
1
--- Modules/FindLAPACK.cmake.orig	2014-09-15 23:50:11.377111987 +0200
Line 0 Link Here
1
--- Modules/FindPythonInterp.cmake.orig	2015-01-06 11:50:03.376357898 +0100
Line 0 Link Here
1
Do not detect Xcode and set -isysroot for its SDK, since that messes up
2
our toolchain, and hence makes any compilation fail, bug #445308
3
4
--- Modules/Platform/Darwin-Initialize.cmake
5
+++ Modules/Platform/Darwin-Initialize.cmake
6
@@ -1,16 +1,16 @@
7
 # Ask xcode-select where to find /Developer or fall back to ancient location.
8
-execute_process(COMMAND xcode-select -print-path
9
-  OUTPUT_VARIABLE _stdout
10
-  OUTPUT_STRIP_TRAILING_WHITESPACE
11
-  ERROR_VARIABLE _stderr
12
-  RESULT_VARIABLE _failed)
13
-if(NOT _failed AND IS_DIRECTORY ${_stdout})
14
-  set(OSX_DEVELOPER_ROOT ${_stdout})
15
-elseif(IS_DIRECTORY "/Developer")
16
-  set(OSX_DEVELOPER_ROOT "/Developer")
17
-else()
18
+#execute_process(COMMAND xcode-select -print-path
19
+#  OUTPUT_VARIABLE _stdout
20
+#  OUTPUT_STRIP_TRAILING_WHITESPACE
21
+#  ERROR_VARIABLE _stderr
22
+#  RESULT_VARIABLE _failed)
23
+#if(NOT _failed AND IS_DIRECTORY ${_stdout})
24
+#  set(OSX_DEVELOPER_ROOT ${_stdout})
25
+#elseif(IS_DIRECTORY "/Developer")
26
+#  set(OSX_DEVELOPER_ROOT "/Developer")
27
+#else()
28
   set(OSX_DEVELOPER_ROOT "")
29
-endif()
30
+#endif()
31
 
32
 execute_process(COMMAND sw_vers -productVersion
33
   OUTPUT_VARIABLE CURRENT_OSX_VERSION
34
@@ -91,10 +91,10 @@
35
 # CMAKE_OSX_DEPLOYMENT_TARGET
36
 
37
 # Set cache variable - end user may change this during ccmake or cmake-gui configure.
38
-if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
39
-  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
40
-    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
41
-endif()
42
+#if(_CURRENT_OSX_VERSION VERSION_GREATER 10.3)
43
+#  set(CMAKE_OSX_DEPLOYMENT_TARGET "$ENV{MACOSX_DEPLOYMENT_TARGET}" CACHE STRING
44
+#    "Minimum OS X version to target for deployment (at runtime); newer APIs weak linked. Set to empty string for default value.")
45
+#endif()
46
 
47
 #----------------------------------------------------------------------------
48
 # CMAKE_OSX_SYSROOT
(-)a/dev-util/cmake/files/cmake-3.2.3-musl-missing-include.patch (+30 lines)
Line 0 Link Here
1
diff -Naur cmake-3.2.2.orig/Source/cmGeneratorExpressionEvaluationFile.h cmake-3.2.2/Source/cmGeneratorExpressionEvaluationFile.h
2
--- cmake-3.2.2.orig/Source/cmGeneratorExpressionEvaluationFile.h	2015-04-13 17:09:00.000000000 +0000
Line 0 Link Here
1
From c775072ad5a93306183f83f4396268b1690bb392 Mon Sep 17 00:00:00 2001
2
From: Brad King <brad.king@kitware.com>
3
Date: Wed, 22 Apr 2015 09:58:46 -0400
4
Subject: [PATCH] cmGeneratorExpressionEvaluationFile: Add missing sys/types.h
5
 include
6
7
This is needed for 'mode_t', and on mingw-w64 in particular.  We added
8
use of 'mode_t' in commit v3.2.0-rc1~421^2 (file(GENERATE): Use
9
permissions of input file if present, 2014-07-22).
10
---
11
 Source/cmGeneratorExpressionEvaluationFile.h |    1 +
12
 1 file changed, 1 insertion(+)
13
14
diff --git a/Source/cmGeneratorExpressionEvaluationFile.h b/Source/cmGeneratorExpressionEvaluationFile.h
15
index 4424bec..5d8b54c 100644
16
--- a/Source/cmGeneratorExpressionEvaluationFile.h
17
+++ b/Source/cmGeneratorExpressionEvaluationFile.h
18
@@ -13,6 +13,7 @@
19
 #define cmGeneratorExpressionEvaluationFile_h
20
 
21
 #include "cmStandardIncludes.h"
22
+#include <sys/types.h>
23
 #include <cmsys/auto_ptr.hxx>
24
 
25
 #include "cmGeneratorExpression.h"
26
-- 
27
1.7.10.4
28
(-)a/dev-util/cmake/files/cmake.vim (+3 lines)
Line 0 Link Here
1
autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in runtime! indent/cmake.vim 
2
autocmd BufRead,BufNewFile *.cmake,CMakeLists.txt,*.cmake.in setf cmake
3
autocmd BufRead,BufNewFile *.ctest,*.ctest.in setf cmake
(-)a/dev-util/cmake/metadata.xml (-1 / +8 lines)
Line 0 Link Here
0
- 
1
<?xml version="1.0" encoding="UTF-8"?>
2
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
3
<pkgmetadata>
4
	<herd>kde</herd>
5
	<use>
6
		<flag name="system-jsoncpp">Use system copy of <pkg>dev-libs/jsoncpp</pkg> instead of bundled one.</flag>
7
	</use>
8
</pkgmetadata>

Return to bug 559500