diff options
| author |   Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-03 21:58:07 +0000 |
|---|---|---|
| committer | Tomas Chvatal <scarabeus@gentoo.org> | 2009-02-03 21:58:07 +0000 |
| commit | 08d5d3ed7e6a3880a81ea0a9402ddd0a28337909 (patch) | |
| tree | 631437118b374c386cbbf5f102ea3e9180f42206 /dev-util | |
| parent | add missing test use flag to IUSE (diff) | |
| download | historical-08d5d3ed7e6a3880a81ea0a9402ddd0a28337909.tar.gz historical-08d5d3ed7e6a3880a81ea0a9402ddd0a28337909.tar.bz2 historical-08d5d3ed7e6a3880a81ea0a9402ddd0a28337909.zip | |
Fix src_configure. Per bug #254898.
Package-Manager: portage-2.2_rc23/cvs/Linux i686
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/cmake/Manifest | 14 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.6.2-r1.ebuild | 14 |
3 files changed, 14 insertions, 19 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index a2e52412a686..58ac6a8f3e9c 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/cmake # Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.78 2009/01/21 22:16:15 maekke Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.79 2009/02/03 21:58:07 scarabeus Exp $ + + 03 Feb 2009; Tomas Chvatal <scarabeus@gentoo.org> cmake-2.6.2-r1.ebuild: + Fix src_configure. Per bug #254898. 21 Jan 2009; Markus Meier <maekke@gentoo.org> cmake-2.4.8.ebuild: amd64/x86 stable diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest index b9de86b65a6d..02d3d987bb14 100644 --- a/dev-util/cmake/Manifest +++ b/dev-util/cmake/Manifest @@ -1,6 +1,3 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - AUX 50cmake-gentoo.el 244 RMD160 effb4416a5170ed7c99ea74084f2598e2482fdf0 SHA1 c34102f3343980275169144b40af6ec69a87d7fc SHA256 6010e6df84aa23050fcbc490ae2b22802ede0870ff2e96c43fe541e97e0d6c00 AUX FindSWIG.cmake 2263 RMD160 c56589a1b2401b3b55a5d3f5336d8ad7d797b4c6 SHA1 c3687448a47ba49d9d03fea5ed0ba93cb85b60ae SHA256 5be6bdbfaf93f7d69845544b697d120732341ed2d8af043cdd43f5a892d06de0 AUX cmake-2.0.6-rpath-fix.patch 526 RMD160 9039e42ce4def8ae7ce38946cb55b95b4502a1e9 SHA1 8e181634b1663a27139682309fb4180a0dbaa82d SHA256 18c58ecf9bdddce15764ab3481aba570e3378f8d8b1c5306a050b2c33323a1bc @@ -15,14 +12,7 @@ DIST cmake-2.6.2.tar.gz 3543548 RMD160 df7ed9bba605bf31494aa1b835dee264b5fcb6bd EBUILD cmake-2.4.6-r1.ebuild 1933 RMD160 db78c10337212e1509cfbde355f9a5df954e347d SHA1 82048b8a1f483bafb1cb7fb3817c1ac56d804c2d SHA256 2504feaecd4ceae8c757da875d8a5d191be5783c0b9498dcc9f94c29ddaa76fb EBUILD cmake-2.4.7-r1.ebuild 2103 RMD160 c508a57af1782d997537316a155277d9dba8f54a SHA1 68d0d5aa0ef76b492df5795f2539a9f0973abcca SHA256 f09541251a3d019e9813eaaa9817f24e778905e9d4591d5f6bf7a0fb3763f805 EBUILD cmake-2.4.8.ebuild 2781 RMD160 9ef40a4b3ab3c867a59fa83b9412b071a5a4dc39 SHA1 5e16f59c6fa1ced5a83299d0901c779e53b55195 SHA256 29bcd625a428f86b4861bcc9d440fdd0f27d8fc17c65376101ba95e25bede521 -EBUILD cmake-2.6.2-r1.ebuild 2775 RMD160 ecb5087601b2216e729a480fa7e009a98a107a69 SHA1 efde331ad4fc15b5c9a5c5b02f284aeab637a93e SHA256 49e50b7d8768469bb241ca9e869b71d7900d3865883ef4ba69cfb8fc4867eff5 +EBUILD cmake-2.6.2-r1.ebuild 2831 RMD160 6f5359c11a4e6a1eb9861682f3e3364876900a89 SHA1 a50e1d454ea32174d999feb298acea5a1d12d3c6 SHA256 166364b78f92f8b0d655cdbf33d8051d325d7c09e3e05ec549b945559acbeed0 EBUILD cmake-2.6.2.ebuild 2790 RMD160 544b72eb61e9c11045ebd6eecc54fff27753d8a2 SHA1 1a22ffd7b1fe5163b40e411b12ba03cc77a7e14b SHA256 68a8cca8707d1b4b7497f6e1f0c5e7138cc92a8ba0bdccffe5bc6ff1b74b643a -MISC ChangeLog 12315 RMD160 4815a7bfbe3c595e0af4bf8ec94c4af0f727487b SHA1 b581680776ffca1dffed53c0b042ecb683855b46 SHA256 3423ab72b6470b396579ac2b1a90e82a8447222260f776461f3bb997ca2b9551 +MISC ChangeLog 12432 RMD160 8511248acb1af99eb4ce301e6229f7ef6f7f4284 SHA1 22b5b0935fb7256c0abeacd209d38f50f123e0b7 SHA256 59e9338567fd7b6e778ae54d38d1203e40ec98dd33413a74019f754463343ba5 MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.9 (GNU/Linux) - -iEYEARECAAYFAkl3nrsACgkQkKaRLQcq0GIW8gCfYsTa+Vt+KT3WUYsXUg6esZzi -Ki4AnjdtVW6izqNPjpz2aCnOKMJc9V1L -=B/gs ------END PGP SIGNATURE----- diff --git a/dev-util/cmake/cmake-2.6.2-r1.ebuild b/dev-util/cmake/cmake-2.6.2-r1.ebuild index 5baa4b6b3e7d..da44773cdaae 100644 --- a/dev-util/cmake/cmake-2.6.2-r1.ebuild +++ b/dev-util/cmake/cmake-2.6.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2009 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.2-r1.ebuild,v 1.1 2009/01/03 22:05:12 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.6.2-r1.ebuild,v 1.2 2009/02/03 21:58:07 scarabeus Exp $ EAPI="2" @@ -42,20 +42,24 @@ src_prepare() { } src_configure() { + # due to bootstrap, everything is done in src_compile + true +} + +src_compile() { + local qt_arg par_arg if [[ "$(gcc-major-version)" -eq "3" ]] ; then append-flags "-fno-stack-protector" fi tc-export CC CXX LD - - local qt_arg + if use qt4; then qt_arg="--qt-gui" else qt_arg="--no-qt-gui" fi - local par_arg echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' > /dev/null if [ $? -eq 0 ]; then par_arg=$(echo $MAKEOPTS | egrep -o '(\-j|\-\-jobs)(=?|[[:space:]]*)[[:digit:]]+' | egrep -o '[[:digit:]]+') @@ -63,9 +67,7 @@ src_configure() { else par_arg="--parallel=1" fi -} -src_compile() { ./bootstrap \ --system-libs \ --prefix=/usr \ |