summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2011-10-05 17:46:20 +0000
committerHans de Graaff <graaff@gentoo.org>2011-10-05 17:46:20 +0000
commit83dca121f353b3d998c3d51c0c47bb269a23dbb5 (patch)
treeb915ed55ef84bb7355dd4c488c866ef7e18e9aa2 /eclass
parentppc/ppc64 stable wrt #369909 (diff)
downloadhistorical-83dca121f353b3d998c3d51c0c47bb269a23dbb5.tar.gz
historical-83dca121f353b3d998c3d51c0c47bb269a23dbb5.tar.bz2
historical-83dca121f353b3d998c3d51c0c47bb269a23dbb5.zip
Set up java vm properly when using jruby. Fixes problems reported in bug 384901. Thanks to matsuu for diagnosis and patch.
Diffstat (limited to 'eclass')
-rw-r--r--eclass/ruby-ng.eclass6
1 files changed, 4 insertions, 2 deletions
diff --git a/eclass/ruby-ng.eclass b/eclass/ruby-ng.eclass
index bbc5c5483d93..7d47ecdf64e1 100644
--- a/eclass/ruby-ng.eclass
+++ b/eclass/ruby-ng.eclass
@@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.39 2011/08/22 04:46:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/ruby-ng.eclass,v 1.40 2011/10/05 17:46:20 graaff Exp $
# @ECLASS: ruby-ng.eclass
# @MAINTAINER:
@@ -68,7 +68,7 @@
# (e.g. selenium's firefox driver extension). When set this argument is
# passed to "grep -E" to remove reporting of these shared objects.
-inherit eutils toolchain-funcs
+inherit eutils java-utils-2 toolchain-funcs
EXPORT_FUNCTIONS src_unpack src_prepare src_configure src_compile src_test src_install pkg_setup
@@ -394,6 +394,8 @@ ruby-ng_pkg_setup() {
# before doing anything; by leaving the parameters empty we know
# it's a special case.
_ruby_each_implementation
+
+ use ruby_targets_jruby && java-pkg_setup-vm
}
# @FUNCTION: ruby-ng_src_unpack