diff options
| author | glarkin <glarkin@FreeBSD.org> | 2010-05-04 02:03:34 +0800 |
|---|---|---|
| committer | glarkin <glarkin@FreeBSD.org> | 2010-05-04 02:03:34 +0800 |
| commit | d011fd2ef33234c1cef45919accf30677f9ca64a (patch) | |
| tree | 06befdc4ef56c8c5730bc0aabfdd146723bd9999 /lang/gcc45 | |
| parent | a990125a5e23b6e8360fffe718b289e230695bd5 (diff) | |
| download | freebsd-ports-gnome-d011fd2ef33234c1cef45919accf30677f9ca64a.tar.gz freebsd-ports-gnome-d011fd2ef33234c1cef45919accf30677f9ca64a.tar.zst freebsd-ports-gnome-d011fd2ef33234c1cef45919accf30677f9ca64a.zip | |
- Added support for gcj (Java compiler) to prepare the print/pdftk port
to migrate from gcj42 to gcj45.
- Bumped PORTREVISION (packing list & port functionality changes)
Approved by: gerald (via email)
Diffstat (limited to 'lang/gcc45')
| -rw-r--r-- | lang/gcc45/Makefile | 18 | ||||
| -rw-r--r-- | lang/gcc45/distinfo | 3 | ||||
| -rw-r--r-- | lang/gcc45/pkg-plist | 1 |
3 files changed, 17 insertions, 5 deletions
diff --git a/lang/gcc45/Makefile b/lang/gcc45/Makefile index 087a6d934ecb..7a4e0730c73f 100644 --- a/lang/gcc45/Makefile +++ b/lang/gcc45/Makefile @@ -8,7 +8,7 @@ PORTNAME= gcc PORTVERSION= 4.5.1.20100429 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} @@ -102,12 +102,16 @@ INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/libgomp .if ! defined(WITHOUT_JAVA) -DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} -BUILD_DEPENDS+= zip:${PORTSDIR}/archivers/zip +ECJ_JAR= ecj-4.5.jar +MASTER_SITES+= ${MASTER_SITE_SOURCEWARE:S|$|:ecj|} +MASTER_SITE_SUBDIR+= java/:ecj +DISTFILES+= gcc-java-${VERSIONSTRING}${EXTRACT_SUFX} \ + ${ECJ_JAR}:ecj +EXTRACT_ONLY= ${DISTFILES:S|${ECJ_JAR}:ecj||} EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier # FIXME: we are currently getting weird build failures with libjava on # some 4.x and 5.x systems, which the following works around. PR 81788. -CONFIGURE_ARGS+=--disable-rpath +CONFIGURE_ARGS+=--disable-rpath --enable-libgcj MAN1+= aot-compile${SUFFIX}.1 \ gappletviewer${SUFFIX}.1 \ gc-analyze${SUFFIX}.1 \ @@ -136,6 +140,10 @@ 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 " @@ -144,7 +152,7 @@ PLIST_SUB+= JAVA="@comment " pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${OPSYS} ${OSREL} target=${CONFIGURE_TARGET}" -post-patch: +post-patch:: @${REINPLACE_CMD} -e 's|\(const char version_string.*\)";|\1 [FreeBSD]";|' \ ${SRCDIR}/gcc/version.c diff --git a/lang/gcc45/distinfo b/lang/gcc45/distinfo index 029a1d096764..2a7990c8c135 100644 --- a/lang/gcc45/distinfo +++ b/lang/gcc45/distinfo @@ -13,3 +13,6 @@ SIZE (gcc-testsuite-4.5-20100429.tar.bz2) = 5531436 MD5 (gcc-java-4.5-20100429.tar.bz2) = e084c863891b1df58178493dc46e6255 SHA256 (gcc-java-4.5-20100429.tar.bz2) = a470a893ff556cf603e1185866d662a14cfa466cf9375a284ec71d115c53c086 SIZE (gcc-java-4.5-20100429.tar.bz2) = 18542433 +MD5 (ecj-4.5.jar) = d7cd6a27c8801e66cbaa964a039ecfdb +SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 +SIZE (ecj-4.5.jar) = 1470676 diff --git a/lang/gcc45/pkg-plist b/lang/gcc45/pkg-plist index 419da288e526..a3b2a64c2d7c 100644 --- a/lang/gcc45/pkg-plist +++ b/lang/gcc45/pkg-plist @@ -42,6 +42,7 @@ share/gcc-%%GCC_VER%%/python/libstdcxx/v6/printers.py %%JAVA%%bin/jv-convert%%SUFFIX%% %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%% %%JAVA%%libdata/pkgconfig/libgcj-4.5.pc +%%JAVA%%share/java/ecj.jar %%JAVA%%share/java/libgcj-%%GCC_VER%%.jar %%JAVA%%share/java/libgcj-tools-%%GCC_VER%%.jar %%JAVA%%share/python/aotcompile.py |