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

[Mark Loeser (halcy0n)]

halcy0n     08/08/03 01:43:31

  Modified:             toolchain.eclass
  Log:
  Fix bug #220779; thanks to Andrew John Hughes <gnu_andrew AT member DOT fsf DOT org> and James Le Cuirot <chewi AT aura-online DOT co DOT uk>

Revision  Changes    Path
1.359                eclass/toolchain.eclass

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.359&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?rev=1.359&content-type=text/plain
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/eclass/toolchain.eclass?r1=1.358&r2=1.359

Index: toolchain.eclass
===================================================================
RCS file: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -r1.358 -r1.359
--- toolchain.eclass	6 Jul 2008 02:41:54 -0000	1.358
+++ toolchain.eclass	3 Aug 2008 01:43:30 -0000	1.359
@@ -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.358 2008/07/06 02:41:54 halcy0n Exp $
+# $Header: /var/cvsroot/gentoo-x86/eclass/toolchain.eclass,v 1.359 2008/08/03 01:43:30 halcy0n Exp $
 #
 # Maintainer: Toolchain Ninjas <toolchain@g.o>
 
@@ -340,6 +340,11 @@
 	[[ -n ${D_VER} ]] && \
 		GCC_SRC_URI="${GCC_SRC_URI} d? ( mirror://sourceforge/dgcc/gdc-${D_VER}-src.tar.bz2 )"
 
+	# >= gcc-4.3 no longer bundles ecj.jar
+	tc_version_is_at_least "4.3" && \
+		GCC_SRC_URI="${GCC_SRC_URI}
+		gcj? ( ftp://sourceware.org/pub/java/ecj-${GCC_BRANCH_VER}.jar )"
+
 	echo "${GCC_SRC_URI}"
 }
 S=$(gcc_get_s_dir)
@@ -1066,6 +1071,12 @@
 		cp -pPR "${S}"/libstdc++-v3/config/cpu/i{4,3}86/atomicity.h
 	fi
 
+	# >= gcc-4.3 doesn't bundle ecj.jar anymore, so copy it
+	if [[ ${GCCMAJOR}.${GCCMINOR} > 4.2 ]] &&
+		use gcj ; then
+		cp -pPR "${DISTDIR}/ecj-${GCC_BRANCH_VER}.jar" "${S}/ecj.jar" || die
+	fi
+
 	# disable --as-needed from being compiled into gcc specs
 	# natively when using a gcc version < 3.4.4
 	# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=14992