Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 21 Oct 2012 18:21:18 +0000 (UTC)
From:      Gerald Pfeifer <gerald@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r306242 - head/lang/gcc47
Message-ID:  <201210211821.q9LILI6G031751@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: gerald
Date: Sun Oct 21 18:21:18 2012
New Revision: 306242
URL: http://svn.freebsd.org/changeset/ports/306242

Log:
  Forward port inclusion and use of the Eclipse Java compiler. [1]
  
  Update to the 20121013 snapshot of GCC 4.7.3.
  
  Submitted by:	jkim [1]
  Feature safe:	yes

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

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Sun Oct 21 17:13:16 2012	(r306241)
+++ head/lang/gcc47/Makefile	Sun Oct 21 18:21:18 2012	(r306242)
@@ -2,11 +2,11 @@
 # $FreeBSD$
 
 PORTNAME=	gcc
-PORTVERSION=	4.7.3.20120929
+PORTVERSION=	4.7.3.20121013
 CATEGORIES=	lang java
 MASTER_SITES=	${MASTER_SITE_GCC}
 MASTER_SITE_SUBDIR=	snapshots/${VERSIONSTRING}
-DISTNAME=	gcc-${VERSIONSTRING}
+DISTFILES=	gcc-${VERSIONSTRING}${EXTRACT_SUFX}
 
 MAINTAINER=	gerald@FreeBSD.org
 COMMENT=	GNU Compiler Collection 4.7
@@ -97,6 +97,11 @@ 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
 EXTRA_PATCHES+=	${FILESDIR}/java-patch-hier
 LANGUAGES:=	${LANGUAGES},java
@@ -128,6 +133,10 @@ MAN3=		ffi${SUFFIX}.3 \
 INFO+=		gcc${SUFFIX}/cp-tools \
 		gcc${SUFFIX}/gcj
 PLIST_SUB+=	JAVA=""
+
+# Prep 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/gcc47/distinfo
==============================================================================
--- head/lang/gcc47/distinfo	Sun Oct 21 17:13:16 2012	(r306241)
+++ head/lang/gcc47/distinfo	Sun Oct 21 18:21:18 2012	(r306242)
@@ -1,2 +1,4 @@
-SHA256 (gcc-4.7-20120929.tar.bz2) = bd816447e81c422564ad2d98cd6255552f0f3ca1d335b43b2c2858f0d0f91efd
-SIZE (gcc-4.7-20120929.tar.bz2) = 78873496
+SHA256 (gcc-4.7-20121013.tar.bz2) = 9da0e37f6f6aa79ee88150dd8c87b4bfca88f77c176fc013529597f6113e7412
+SIZE (gcc-4.7-20121013.tar.bz2) = 78892306
+SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781
+SIZE (ecj-4.5.jar) = 1470676

Modified: head/lang/gcc47/pkg-plist
==============================================================================
--- head/lang/gcc47/pkg-plist	Sun Oct 21 17:13:16 2012	(r306241)
+++ head/lang/gcc47/pkg-plist	Sun Oct 21 18:21:18 2012	(r306242)
@@ -50,6 +50,7 @@ share/gcc-%%GCC_VERSION%%/python/libstdc
 %%JAVA%%bin/jv-convert%%SUFFIX%%
 %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%%
 %%JAVA%%libdata/pkgconfig/libgcj-4.7.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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201210211821.q9LILI6G031751>