svn commit: r313359 - head/lang/gcc

[Gerald Pfeifer]

Author: gerald
Date: Sun Mar  3 15:22:18 2013
New Revision: 313359
URL: http://svnweb.freebsd.org/changeset/ports/313359

Log:
  Use the new lang/gcc-ecj45 port when building the Java frontend
  instead of including a pre-built version of the Eclipse Java Compiler
  (ECJ) ourselves. [1]
  
  Replace the use of DISTFILES by DISTNAME, since we are now down to
  one in all cases.
  
  Make binutils a build dependency as well (not just a run-time dependency).
  
  PR:		175072 [1]

Modified:
  head/lang/gcc/Makefile
  head/lang/gcc/distinfo
  head/lang/gcc/pkg-plist

Modified: head/lang/gcc/Makefile
==============================================================================
--- head/lang/gcc/Makefile	Sun Mar  3 15:17:19 2013	(r313358)
+++ head/lang/gcc/Makefile	Sun Mar  3 15:22:18 2013	(r313359)
@@ -6,7 +6,7 @@ PORTVERSION=	4.6.3
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	releases/gcc-${VERSIONSTRING}
-DISTFILES=	gcc-${VERSIONSTRING}${EXTRACT_SUFX}
+DISTNAME=	gcc-${VERSIONSTRING}
 
 MAINTAINER=	gerald at FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.6
@@ -14,6 +14,7 @@ COMMENT=	GNU Compiler Collection 4.6
 LIB_DEPENDS=	gmp:${PORTSDIR}/math/gmp \
 		mpfr:${PORTSDIR}/math/mpfr \
 		mpc:${PORTSDIR}/math/mpc
+BUILD_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 RUN_DEPENDS+=	${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils
 
 .if defined(MAINTAINER_MODE)
@@ -94,13 +95,12 @@ INFO+=		gcc${SUFFIX}/libquadmath
 #.endif
 
 .if ${PORT_OPTIONS:MJAVA}
-ECJ_JAR=	ecj-4.5.jar
-MASTER_SITES+=	${MASTER_SITE_SOURCEWARE:S|$|:ecj|}
-MASTER_SITE_SUBDIR+=	java/:ecj
-DISTFILES+=	${ECJ_JAR}:ecj
-EXTRACT_ONLY=	${DISTFILES:S|${ECJ_JAR}:ecj||}
-BUILD_DEPENDS+=	zip:${PORTSDIR}/archivers/zip
+ECJ_JAR=	${LOCALBASE}/share/java/ecj-4.5.jar
+BUILD_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45 \
+		zip:${PORTSDIR}/archivers/zip
+RUN_DEPENDS+=	${ECJ_JAR}:${PORTSDIR}/lang/gcc-ecj45
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
+CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR}
 LANGUAGES:=	${LANGUAGES},java
 MAN1+=		aot-compile${SUFFIX}.1 \
 		gappletviewer${SUFFIX}.1 \
@@ -130,10 +130,6 @@ MAN3=		ffi${SUFFIX}.3 \
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
-
-# Preps the source tree for the gcj build
-post-patch::
-	@${CP} ${DISTDIR}/${ECJ_JAR} ${SRCDIR}/ecj.jar
 .else
 CONFIGURE_ARGS+=--disable-libgcj
 PLIST_SUB+=	JAVA="@comment "

Modified: head/lang/gcc/distinfo
==============================================================================
--- head/lang/gcc/distinfo	Sun Mar  3 15:17:19 2013	(r313358)
+++ head/lang/gcc/distinfo	Sun Mar  3 15:22:18 2013	(r313359)
@@ -1,4 +1,2 @@
 SHA256 (gcc-4.6.3.tar.bz2) = e8f5853d4eec2f5ebaf8a72ae4d53c436aacf98153b2499f8635b48c4718a093
 SIZE (gcc-4.6.3.tar.bz2) = 71999439
-SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
-SIZE (ecj-4.5.jar) = 1470676

Modified: head/lang/gcc/pkg-plist
==============================================================================
--- head/lang/gcc/pkg-plist	Sun Mar  3 15:17:19 2013	(r313358)
+++ head/lang/gcc/pkg-plist	Sun Mar  3 15:22:18 2013	(r313359)
@@ -44,7 +44,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdc
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.6.pc
-%%JAVA%%share/java/ecj.jar
 %%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar
 %%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar
 @exec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi