diff options
| author |   Alistair Bush <ali_bush@gentoo.org> | 2010-06-26 11:58:41 +0000 |
|---|---|---|
| committer | Alistair Bush <ali_bush@gentoo.org> | 2010-06-26 11:58:41 +0000 |
| commit | b03e9f9ee03627b28cc96a46562bd5cbd12abd0a (patch) | |
| tree | af6c33cadf1d691a6a88d5d0a87318f0830e6c82 /dev-java/jruby/jruby-1.4.1.ebuild | |
| parent | Fix for Python ABIs, #316221; corrected HOMEPAGE (diff) | |
| download | gentoo-2-b03e9f9ee03627b28cc96a46562bd5cbd12abd0a.tar.gz gentoo-2-b03e9f9ee03627b28cc96a46562bd5cbd12abd0a.tar.bz2 gentoo-2-b03e9f9ee03627b28cc96a46562bd5cbd12abd0a.zip | |
Fix #305459 in both 1.4.1 and 1.5.1. Fix bug 325191 for 1.5.1 and progress towards getting tests working for 1.5.1.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
Diffstat (limited to 'dev-java/jruby/jruby-1.4.1.ebuild')
| -rw-r--r-- | dev-java/jruby/jruby-1.4.1.ebuild | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/dev-java/jruby/jruby-1.4.1.ebuild b/dev-java/jruby/jruby-1.4.1.ebuild index 01f6ddf19eb9..7cd7c1127d11 100644 --- a/dev-java/jruby/jruby-1.4.1.ebuild +++ b/dev-java/jruby/jruby-1.4.1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2010 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.1.ebuild,v 1.2 2010/06/19 11:07:14 ali_bush Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/jruby/jruby-1.4.1.ebuild,v 1.3 2010/06/26 11:58:41 ali_bush Exp $ EAPI="2" JAVA_PKG_IUSE="doc source test" @@ -112,6 +112,9 @@ java_prepare() { find build_lib -name "*.jar" ! -name "jsr292-mock.jar" -delete || die rm lib/profile.jar || die + use bsf && java-pkg_jar-from --into build_lib \ + --build-only bsf-2.3 + if ! use bsf; then # Remove BSF test cases. cd "${S}/test/org/jruby" @@ -123,7 +126,8 @@ java_prepare() { } src_compile() { - eant jar $(use_doc apidocs) -Djdk1.5+=true + eant jar $(use_doc apidocs) $(use bsf && echo "-Dbsf.present") \ + -Djdk1.5+=true } src_test() { |