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 | 4c63c92695ff607d693de79a68ee4e5b45078342 (patch) | |
| tree | 8be29bc8d8c163c3098aa335511dc293cdb1052b /dev-util/cmake | |
| parent | remove unused use flag (diff) | |
| download | gentoo-2-4c63c92695ff607d693de79a68ee4e5b45078342.tar.gz gentoo-2-4c63c92695ff607d693de79a68ee4e5b45078342.tar.bz2 gentoo-2-4c63c92695ff607d693de79a68ee4e5b45078342.zip | |
Fix src_configure. Per bug #254898.
(Portage version: 2.2_rc23/cvs/Linux i686)
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.6.2-r1.ebuild | 14 |
2 files changed, 12 insertions, 7 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/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 \ |