diff options
| author | gerald <gerald@FreeBSD.org> | 2013-01-21 00:44:04 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2013-01-21 00:44:04 +0800 |
| commit | 8100a4ecdfc9e3d276bc0a2e78d696cf3884ba17 (patch) | |
| tree | 854449d4c0464cda97c7258a0800f921e13029a9 /lang/gcc48/Makefile | |
| parent | ac6c902ac8df1f10c0fbbcf4a16bd15adcf31478 (diff) | |
| download | freebsd-ports-gnome-8100a4ecdfc9e3d276bc0a2e78d696cf3884ba17.tar.gz freebsd-ports-gnome-8100a4ecdfc9e3d276bc0a2e78d696cf3884ba17.tar.zst freebsd-ports-gnome-8100a4ecdfc9e3d276bc0a2e78d696cf3884ba17.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]
On the way, update to the 20130113 snapshot of GCC 4.8.0.
PR: 175072
Diffstat (limited to 'lang/gcc48/Makefile')
| -rw-r--r-- | lang/gcc48/Makefile | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/lang/gcc48/Makefile b/lang/gcc48/Makefile index 84e2972fb1a8..eca9bd45cfc3 100644 --- a/lang/gcc48/Makefile +++ b/lang/gcc48/Makefile @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.8.0.20130106 +PORTVERSION= 4.8.0.20130113 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} @@ -98,13 +98,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 \ @@ -136,10 +135,6 @@ INFO+= gcc${SUFFIX}/cp-tools \ gcc${SUFFIX}/gcj \ gcc${SUFFIX}/libffi 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 " |