summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans de Graaff <graaff@gentoo.org>2012-04-29 15:43:56 +0000
committerHans de Graaff <graaff@gentoo.org>2012-04-29 15:43:56 +0000
commit913b9295c509e8912766e53c4f331e40357cecb6 (patch)
tree5d38c59c94c90f5d8411c776de48e8ba63a7ffa4
parentx86 stable, bug #410611 (diff)
downloadgentoo-2-913b9295c509e8912766e53c4f331e40357cecb6.tar.gz
gentoo-2-913b9295c509e8912766e53c4f331e40357cecb6.tar.bz2
gentoo-2-913b9295c509e8912766e53c4f331e40357cecb6.zip
Apply fix for USE=bsf build by sera reported in bug 412379.
(Portage version: 2.1.10.49/cvs/Linux x86_64)
-rw-r--r--dev-java/jruby/ChangeLog5
-rw-r--r--dev-java/jruby/jruby-1.6.5.1.ebuild4
2 files changed, 6 insertions, 3 deletions
diff --git a/dev-java/jruby/ChangeLog b/dev-java/jruby/ChangeLog
index e96b738e6066..1805f0163c41 100644
--- a/dev-java/jruby/ChangeLog
+++ b/dev-java/jruby/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-java/jruby
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.81 2012/04/29 04:50:00 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/ChangeLog,v 1.82 2012/04/29 15:43:56 graaff Exp $
+
+ 29 Apr 2012; Hans de Graaff <graaff@gentoo.org> jruby-1.6.5.1.ebuild:
+ Apply fix for USE=bsf build by sera reported in bug 412379.
*jruby-1.6.7 (29 Apr 2012)
diff --git a/dev-java/jruby/jruby-1.6.5.1.ebuild b/dev-java/jruby/jruby-1.6.5.1.ebuild
index 6cdab99b6905..e99bd1eac0c0 100644
--- a/dev-java/jruby/jruby-1.6.5.1.ebuild
+++ b/dev-java/jruby/jruby-1.6.5.1.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild,v 1.1 2012/04/14 07:05:17 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.6.5.1.ebuild,v 1.2 2012/04/29 15:43:56 graaff Exp $
EAPI="4"
JAVA_PKG_IUSE="doc source test"
@@ -127,7 +127,7 @@ src_compile() {
# Avoid generating the ri cache since that currently fails.
local flags="-Dgenerate-ri-cache.hasrun=true"
#local flags=""
- use bsf && flags="-Dbsf.present=true"
+ use bsf && flags+=" -Dbsf.present=true"
export RUBYOPT=""
einfo $RUBYOPT