From owner-freebsd-java@FreeBSD.ORG Tue Jan 15 00:35:39 2013 Return-Path: Delivered-To: java@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by hub.freebsd.org (Postfix) with ESMTP id B2A80AB7; Tue, 15 Jan 2013 00:35:39 +0000 (UTC) (envelope-from gerald@pfeifer.com) Received: from ainaz.pair.com (ainaz.pair.com [209.68.2.66]) by mx1.freebsd.org (Postfix) with ESMTP id 73A7E816; Tue, 15 Jan 2013 00:35:38 +0000 (UTC) Received: from ip-109-84-38-98.web.vodafone.de (ip-109-84-38-98.web.vodafone.de [109.84.38.98]) by ainaz.pair.com (Postfix) with ESMTPSA id 64A213F410; Mon, 14 Jan 2013 19:35:30 -0500 (EST) Date: Tue, 15 Jan 2013 01:35:27 +0100 (CET) From: Gerald Pfeifer To: ports@FreeBSD.org, java@FreeBSD.org Subject: Breaking out gcc-ecj45 from lang/gcc{,46,47,48} Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII X-BeenThere: freebsd-java@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Porting Java to FreeBSD List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 15 Jan 2013 00:35:39 -0000 Hi there, to address ports/175072 I finally went ahead with an old plan of mine and broke the binary ecj.jar that is used to build the Java frontend for our GCC 4.6, 4.7 and 4.8 ports out into a separate port: lang/gcc-ecj45. The patch below shows this, and also -- in case of lang/gcc48 -- how I am planning to adjust the lang/gcc{,46,47,48} ports. Let me know if you have any comments/suggestions on these changes which I plan to commit in one, two days. (The below passed the official set of ports and package testing.) Gerald Index: gcc-ecj45/Makefile =================================================================== --- gcc-ecj45/Makefile (revision 0) +++ gcc-ecj45/Makefile (working copy) @@ -0,0 +1,22 @@ +# Created by: Gerald Pfeifer +# $FreeBSD$ + +PORTNAME= gcc-ecj +PORTVERSION= 4.5 +CATEGORIES= lang java +MASTER_SITES= ${MASTER_SITE_SOURCEWARE} +MASTER_SITE_SUBDIR+= java/ +DISTNAME= ecj-${PORTVERSION}.jar +EXTRACT_SUFX= +EXTRACT_ONLY= + +MAINTAINER= gerald@FreeBSD.org +COMMENT= Eclipse Java Compiler used to build GCC Java + +NO_BUILD= yes +PLIST_FILES= share/java/${DISTNAME} + +do-install: + ${INSTALL_DATA} ${DISTDIR}/${DISTNAME} ${PREFIX}/share/java/ + +.include Index: gcc-ecj45/distinfo =================================================================== --- gcc-ecj45/distinfo (revision 0) +++ gcc-ecj45/distinfo (working copy) @@ -0,0 +1,2 @@ +SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 +SIZE (ecj-4.5.jar) = 1470676 Index: gcc-ecj45/pkg-descr =================================================================== --- gcc-ecj45/pkg-descr (revision 0) +++ gcc-ecj45/pkg-descr (working copy) @@ -0,0 +1,2 @@ +A pre-built version of the Eclipse Java Compiler (ECJ) used to build +the Java frontend of the GNU Compiler Collection (GCC). Index: gcc48/Makefile =================================================================== --- gcc48/Makefile (revision 310417) +++ gcc48/Makefile (working copy) @@ -98,13 +98,12 @@ .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 @@ 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 " Index: gcc48/distinfo =================================================================== --- gcc48/distinfo (revision 310417) +++ gcc48/distinfo (working copy) @@ -1,4 +1,2 @@ SHA256 (gcc-4.8-20130106.tar.bz2) = 5da1212249d54b907bf515a86e99bcf197123c29fac9d1b6f9955cb157ab7a47 SIZE (gcc-4.8-20130106.tar.bz2) = 81998118 -SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 -SIZE (ecj-4.5.jar) = 1470676 Index: gcc48/pkg-plist =================================================================== --- gcc48/pkg-plist (revision 310417) +++ gcc48/pkg-plist (working copy) @@ -50,7 +50,6 @@ %%JAVA%%bin/jv-convert%%SUFFIX%% %%JAVA%%bin/rebuild-gcj-db%%SUFFIX%% %%JAVA%%libdata/pkgconfig/libgcj-4.8.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