diff options
| author |   Wulf Krueger <philantrop@gentoo.org> | 2007-12-17 06:51:30 +0000 |
|---|---|---|
| committer | Wulf Krueger <philantrop@gentoo.org> | 2007-12-17 06:51:30 +0000 |
| commit | 3b5362eb6020dfddafd6065e5c28a60b36b6c738 (patch) | |
| tree | 18ef6e5ebefa428fb22895ed75ecf8e344392d93 /dev-util | |
| parent | Drop keywords as this version doesnt built on modern systems anymore. There ... (diff) | |
| download | gentoo-2-3b5362eb6020dfddafd6065e5c28a60b36b6c738.tar.gz gentoo-2-3b5362eb6020dfddafd6065e5c28a60b36b6c738.tar.bz2 gentoo-2-3b5362eb6020dfddafd6065e5c28a60b36b6c738.zip | |
Added a check to make sure dev-libs/xmlrpc-c has been installed with suitable USE flags. Fixes bug 194405.
(Portage version: 2.1.4_rc9)
Diffstat (limited to 'dev-util')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 7 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.4.7-r2.ebuild | 15 |
2 files changed, 18 insertions, 4 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index b0d8acf7aa6c..20d444f3dd17 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-util/cmake # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.65 2007/10/10 19:27:27 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.66 2007/12/17 06:51:30 philantrop Exp $ + + 17 Dec 2007; Wulf C. Krueger <philantrop@gentoo.org> + cmake-2.4.7-r2.ebuild: + Added a check to make sure dev-libs/xmlrpc-c has been installed with + suitable USE flags. Fixes bug 194405. 10 Oct 2007; Christian Heim <phreak@gentoo.org> cmake-2.4.6-r1.ebuild, cmake-2.4.7.ebuild, cmake-2.4.7-r1.ebuild, cmake-2.4.7-r2.ebuild: diff --git a/dev-util/cmake/cmake-2.4.7-r2.ebuild b/dev-util/cmake/cmake-2.4.7-r2.ebuild index f414cbc90e28..0445164aa8b5 100644 --- a/dev-util/cmake/cmake-2.4.7-r2.ebuild +++ b/dev-util/cmake/cmake-2.4.7-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2007 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r2.ebuild,v 1.3 2007/10/10 19:27:27 phreak Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/cmake-2.4.7-r2.ebuild,v 1.4 2007/12/17 06:51:30 philantrop Exp $ inherit elisp-common toolchain-funcs eutils versionator qt3 flag-o-matic @@ -26,6 +26,17 @@ RDEPEND="${DEPEND}" SITEFILE="50${PN}-gentoo.el" VIMFILE="${PN}.vim" +pkg_setup() { + if ! built_with_use dev-libs/xmlrpc-c libwww && ! built_with_use dev-libs/xmlrpc-c curl ; then + echo + eerror "${PN} requires dev-libs/xmlrpc-c to be built with either the 'libwww' or" + eerror "the 'curl' USE flag or both enabled." + eerror "Please re-emerge dev-libs/xmlrpc-c with USE=\"libwww\" or USE=\"curl\"." + echo + die "Please re-emerge dev-libs/xmlrpc-c with USE=\"libwww\" or USE=\"curl\"." + fi +} + src_unpack() { unpack ${A} cd "${S}" @@ -39,8 +50,6 @@ src_unpack() { } src_compile() { - cd "${S}" - if [ "$(gcc-major-version)" -eq "3" ] ; then append-flags "-fno-stack-protector" fi |