[gentoo-commits] gentoo-x86 commit in eclass: toolchain.eclass

[Ryan Hill (dirtyepic)]

dirtyepic    10/09/05 05:52:46

  Modified:             toolchain.eclass
  Log:
  Use ecj-4.5.jar for >=4.5 (bug #336045).

Revision  Changes    Path
1.439                eclass/toolchain.eclass

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.439&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?rev=1.439&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/eclass/toolchain.eclass?r1=1.438&r2=1.439

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.438
retrieving revision 1.439
diff -u -r1.438 -r1.439
--- toolchain.eclass	14 Aug 2010 01:26:05 -0000	1.438
+++ toolchain.eclass	5 Sep 2010 05:52:46 -0000	1.439
@@ -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/eclass/toolchain.eclass,v 1.438 2010/08/14 01:26:05 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.439 2010/09/05 05:52:46 dirtyepic Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@g.o>
 
@@ -367,9 +367,13 @@
 	# >= gcc-4.3 uses ecj.jar and we only add gcj as a use flag under certain
 	# conditions
 	if [[ ${PN} != "kgcc64" && ${PN} != gcc-* ]] ; then
-		tc_version_is_at_least "4.3" && \
+		if tc_version_is_at_least "4.5" ; then
+			GCC_SRC_URI="${GCC_SRC_URI}
+			gcj? ( ftp://sourceware.org/pub/java/ecj-4.5.jar )"
+		elif tc_version_is_at_least "4.3" ; then
 			GCC_SRC_URI="${GCC_SRC_URI}
 			gcj? ( ftp://sourceware.org/pub/java/ecj-4.3.jar )"
+		fi
 	fi
 
 	echo "${GCC_SRC_URI}"
@@ -1057,9 +1061,14 @@
 	fi
 
 	# >= gcc-4.3 doesn't bundle ecj.jar, so copy it
-	if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] &&
-		use gcj ; then
-		cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
+	if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] && use gcj ; then
+		if tc_version_is_at_least "4.5" ; then
+			einfo "Copying ecj-4.5.jar"
+			cp -pPR "${DISTDIR}/ecj-4.5.jar" "${S}/ecj.jar" || die
+		elif tc_version_is_at_least "4.3" ; then
+			einfo "Copying ecj-4.3.jar"
+			cp -pPR "${DISTDIR}/ecj-4.3.jar" "${S}/ecj.jar" || die
+		fi
 	fi
 
 	# disable --as-needed from being compiled into gcc specs