diff options
| author | gerald <gerald@FreeBSD.org> | 2013-03-03 23:22:18 +0800 |
|---|---|---|
| committer | gerald <gerald@FreeBSD.org> | 2013-03-03 23:22:18 +0800 |
| commit | 5eb986c999f0c9adfa4799c79861da6f2d8d2a1a (patch) | |
| tree | 1292ba42f034b3ce4812475fe3821e505782c536 | |
| parent | 64d3bb70f516a37748ed564b329f4e2d95c16ea8 (diff) | |
| download | freebsd-ports-gnome-5eb986c999f0c9adfa4799c79861da6f2d8d2a1a.tar.gz freebsd-ports-gnome-5eb986c999f0c9adfa4799c79861da6f2d8d2a1a.tar.zst freebsd-ports-gnome-5eb986c999f0c9adfa4799c79861da6f2d8d2a1a.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.
Make binutils a build dependency as well (not just a run-time dependency).
PR: 175072 [1]
| -rw-r--r-- | lang/gcc/Makefile | 18 | ||||
| -rw-r--r-- | lang/gcc/distinfo | 2 | ||||
| -rw-r--r-- | lang/gcc/pkg-plist | 1 |
3 files changed, 7 insertions, 14 deletions
diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile index 7728b313e8e0..8b13cad3d0c9 100644 --- a/lang/gcc/Makefile +++ b/lang/gcc/Makefile @@ -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@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 " diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo index 9b5f42612c37..7d26ab650b74 100644 --- a/lang/gcc/distinfo +++ b/lang/gcc/distinfo @@ -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 diff --git a/lang/gcc/pkg-plist b/lang/gcc/pkg-plist index c43d639a499d..01837937cbfe 100644 --- a/lang/gcc/pkg-plist +++ b/lang/gcc/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 |