diff options
| author | gerald <gerald@FreeBSD.org> | 2013-01-26 22:23:59 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2013-01-26 22:23:59 +0800 |
| commit | e839167fa212a26839ab13f9894b202baede20bc (patch) | |
| tree | 6f0314c7cbf0cd7d7f22c2adf1ff1d46a7861253 /lang | |
| parent | f3f6cdfd8126634ea2ef1345c3511980d44de0a7 (diff) | |
| download | freebsd-ports-gnome-e839167fa212a26839ab13f9894b202baede20bc.tar.gz freebsd-ports-gnome-e839167fa212a26839ab13f9894b202baede20bc.tar.zst freebsd-ports-gnome-e839167fa212a26839ab13f9894b202baede20bc.zip | |
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.
On the way, update to the 20130125 of GCC 4.6.4.
PR: 175072 [1]
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/gcc46/Makefile | 19 | ||||
| -rw-r--r-- | lang/gcc46/distinfo | 6 | ||||
| -rw-r--r-- | lang/gcc46/pkg-plist | 1 |
3 files changed, 9 insertions, 17 deletions
diff --git a/lang/gcc46/Makefile b/lang/gcc46/Makefile index 6197f1ebd900..81e06388c2a9 100644 --- a/lang/gcc46/Makefile +++ b/lang/gcc46/Makefile @@ -2,11 +2,11 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.6.4.20121123 +PORTVERSION= 4.6.4.20130125 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} -DISTFILES= gcc-${VERSIONSTRING}${EXTRACT_SUFX} +DISTNAME= gcc-${VERSIONSTRING} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.6 @@ -95,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 \ @@ -131,10 +130,6 @@ 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 " diff --git a/lang/gcc46/distinfo b/lang/gcc46/distinfo index 521699849c34..f70b12a85149 100644 --- a/lang/gcc46/distinfo +++ b/lang/gcc46/distinfo @@ -1,4 +1,2 @@ -SHA256 (gcc-4.6-20121123.tar.bz2) = 6e14eab5225d65244930e6c16aa66870717039b04d6a42fe1c6680f54fe792da -SIZE (gcc-4.6-20121123.tar.bz2) = 68150899 -SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 -SIZE (ecj-4.5.jar) = 1470676 +SHA256 (gcc-4.6-20130125.tar.bz2) = 5c70fa848c1490f074519158fc9fc3296fa97fc9e1f385dcb5060c6018199850 +SIZE (gcc-4.6-20130125.tar.bz2) = 68133790 diff --git a/lang/gcc46/pkg-plist b/lang/gcc46/pkg-plist index c43d639a499d..01837937cbfe 100644 --- a/lang/gcc46/pkg-plist +++ b/lang/gcc46/pkg-plist @@ -44,7 +44,6 @@ share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py %%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 |