diff options
| author |   Maciej Mrozowski <reavertm@gentoo.org> | 2010-07-07 00:47:22 +0000 |
|---|---|---|
| committer | Maciej Mrozowski <reavertm@gentoo.org> | 2010-07-07 00:47:22 +0000 |
| commit | 4374b72166b482c2286e7375c2d130aa2bb5bfdb (patch) | |
| tree | 85a75f83d14cddeeec63620b905ffaa7de8a5a8b /dev-util/cmake | |
| parent | Version bump. (diff) | |
| download | gentoo-2-4374b72166b482c2286e7375c2d130aa2bb5bfdb.tar.gz gentoo-2-4374b72166b482c2286e7375c2d130aa2bb5bfdb.tar.bz2 gentoo-2-4374b72166b482c2286e7375c2d130aa2bb5bfdb.zip | |
export JAVA_HOME gathered from java-config, bug 315229
(Portage version: 2.2_rc67/cvs/Linux x86_64)
Diffstat (limited to 'dev-util/cmake')
| -rw-r--r-- | dev-util/cmake/ChangeLog | 5 | ||||
| -rw-r--r-- | dev-util/cmake/cmake-2.8.1-r2.ebuild | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/dev-util/cmake/ChangeLog b/dev-util/cmake/ChangeLog index 4163063247d2..13a6850236a8 100644 --- a/dev-util/cmake/ChangeLog +++ b/dev-util/cmake/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for dev-util/cmake # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.136 2010/07/06 21:58:46 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-util/cmake/ChangeLog,v 1.137 2010/07/07 00:47:22 reavertm Exp $ + + 07 Jul 2010; Maciej Mrozowski <reavertm@gentoo.org> cmake-2.8.1-r2.ebuild: + export JAVA_HOME gathered from java-config, bug 315229 06 Jul 2010; Markos Chandras <hwoarang@gentoo.org> cmake-2.8.1-r2.ebuild: Stable on amd64 wrt bug #325845 diff --git a/dev-util/cmake/cmake-2.8.1-r2.ebuild b/dev-util/cmake/cmake-2.8.1-r2.ebuild index f76fd6e13f6c..faae06c1989c 100644 --- a/dev-util/cmake/cmake-2.8.1-r2.ebuild +++ b/dev-util/cmake/cmake-2.8.1-r2.ebuild @@ -71,6 +71,10 @@ src_configure() { append-flags "-fno-stack-protector" fi + # make things work with gentoo java setup + # in case java-config cannot be run, the variable just becomes unset + export JAVA_HOME=$(java-config -g JAVA_HOME 2> /dev/null) + bootstrap=0 has_version ">=dev-util/cmake-2.6.1" || bootstrap=1 if [[ ${bootstrap} = 0 ]]; then |