From ce6819cdde169b7da5ed239b6e99a003169f500b Mon Sep 17 00:00:00 2001 From: Petteri Räty Date: Sat, 27 Sep 2008 11:53:45 +0000 Subject: Make gcj support work with stable gcc. (Portage version: 2.2_rc11/cvs/Linux 2.6.26-gentoo-r1 i686) --- dev-java/eclipse-ecj/ChangeLog | 6 +++++- dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild | 6 ++++-- 2 files changed, 9 insertions(+), 3 deletions(-) (limited to 'dev-java') diff --git a/dev-java/eclipse-ecj/ChangeLog b/dev-java/eclipse-ecj/ChangeLog index 06d9538b77e6..659c7295fd0a 100644 --- a/dev-java/eclipse-ecj/ChangeLog +++ b/dev-java/eclipse-ecj/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-java/eclipse-ecj # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.45 2008/09/17 21:53:57 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/ChangeLog,v 1.46 2008/09/27 11:53:45 betelgeuse Exp $ + + 27 Sep 2008; Petteri Räty + eclipse-ecj-3.4-r2.ebuild: + Make gcj support work with stable gcc. 17 Sep 2008; Vlastimil Babka eclipse-ecj-3.4-r2.ebuild: diff --git a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild index f69c0ffdb2bc..c8fef8263fc6 100644 --- a/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild +++ b/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2008 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild,v 1.2 2008/09/17 21:53:57 caster Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/eclipse-ecj/eclipse-ecj-3.4-r2.ebuild,v 1.3 2008/09/27 11:53:45 betelgeuse Exp $ inherit java-pkg-2 @@ -58,8 +58,10 @@ src_compile() { if use gcj ; then local gccbin="$(gcc-config -B $(ls -1r /etc/env.d/gcc/${CHOST}-* | head -1) || die)" local gcj="${gccbin}/gcj" - javac="${gcj} -C" + javac="${gcj} -C -encoding ISO-8859-1" jar="${gccbin}/gjar" + [[ -x ${jar} ]] || jar="${gccbin}/fastjar" + [[ -x ${jar} ]] || die "No jar found for gcc" java="${gccbin}/gij" else javac_opts="$(java-pkg_javac-args) -encoding ISO-8859-1" -- cgit v1.2.3-65-gdbad