summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJurek Bartuszek <jurek@gentoo.org>2007-06-29 02:48:17 +0000
committerJurek Bartuszek <jurek@gentoo.org>2007-06-29 02:48:17 +0000
commit7bb076682e5e69ff4be8c27d6c04c548222d870b (patch)
treebe35013fab5a530ec153019d60b3c5fe104579f5 /dev-dotnet
parent2.1.3_rc6 bump (diff)
downloadgentoo-2-7bb076682e5e69ff4be8c27d6c04c548222d870b.tar.gz
gentoo-2-7bb076682e5e69ff4be8c27d6c04c548222d870b.tar.bz2
gentoo-2-7bb076682e5e69ff4be8c27d6c04c548222d870b.zip
dev-dotnet/ikvm: switching from ecj to javac (bug #183526)
(Portage version: 2.1.2.7)
Diffstat (limited to 'dev-dotnet')
-rw-r--r--dev-dotnet/ikvm/ChangeLog5
-rw-r--r--dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild16
2 files changed, 15 insertions, 6 deletions
diff --git a/dev-dotnet/ikvm/ChangeLog b/dev-dotnet/ikvm/ChangeLog
index 532024118d80..4902059fa15b 100644
--- a/dev-dotnet/ikvm/ChangeLog
+++ b/dev-dotnet/ikvm/ChangeLog
@@ -1,6 +1,9 @@
# ChangeLog for dev-dotnet/ikvm
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.14 2007/06/26 23:53:10 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ChangeLog,v 1.15 2007/06/29 02:48:17 jurek Exp $
+
+ 29 Jun 2007; Jurek Bartuszek <jurek@gentoo.org> ikvm-0.34.0.2.ebuild:
+ Switching from ecj to javac (bug #183526)
*ikvm-0.34.0.2 (26 Jun 2007)
diff --git a/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild b/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild
index c76e0f18226f..14794b70a33d 100644
--- a/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild
+++ b/dev-dotnet/ikvm/ikvm-0.34.0.2.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-dotnet/ikvm/ikvm-0.34.0.2.ebuild,v 1.1 2007/06/26 23:53:10 jurek Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-dotnet/ikvm/ikvm-0.34.0.2.ebuild,v 1.2 2007/06/29 02:48:17 jurek Exp $
inherit eutils mono multilib
@@ -23,15 +23,20 @@ RDEPEND=">=dev-lang/mono-1.1"
DEPEND="${RDEPEND}
!dev-dotnet/ikvm-bin
>=dev-dotnet/nant-0.85
- =dev-java/eclipse-ecj-3.2*
+ >=virtual/jdk-1.5
app-arch/unzip"
src_compile() {
# Remove unneccesary binaries
rm bin/*.exe
- sed -i -e 's#ecj#/usr/bin/ecj-3.2#' \
- classpath/classpath.build
+ # We use javac instead of ecj because of
+ # memory related problems (see bug #183526)
+ sed -i \
+ -e 's#ecj#javac#' \
+ -e 's#-1.5#-J-mx160M -source 1.5#' \
+ classpath/classpath.build \
+ || die "sed failed"
nant -t:mono-1.0 || die "ikvm build failed"
}
@@ -48,5 +53,6 @@ src_install() {
dodir /usr/$(get_libdir)/pkgconfig
sed -e "s:@VERSION@:${PV}:" \
-e "s:@LIBDIR@:$(get_libdir):" \
- ${FILESDIR}/${PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc
+ ${FILESDIR}/${PN}.pc.in > ${D}/usr/$(get_libdir)/pkgconfig/${PN}.pc \
+ || die "sed failed"
}