[patch] toolchain.eclass.gcj.diff

toolchain.eclass.gcj.diff (text/plain), 1.38 KB, created by Ryan Hill (RETIRED) on 2010-09-05 03:57:24 UTC

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.438
diff -u -r1.438 toolchain.eclass
--- toolchain.eclass	14 Aug 2010 01:26:05 -0000	1.438
+++ toolchain.eclass	5 Sep 2010 03:56:18 -0000
@@ -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