Index: head/lang/gcc48/Makefile =================================================================== --- head/lang/gcc48/Makefile (revision 306818) +++ head/lang/gcc48/Makefile (revision 306819) @@ -1,168 +1,177 @@ # Created by: Gerald Pfeifer # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 4.8.0.20120930 +PORTVERSION= 4.8.0.20121014 CATEGORIES= lang java MASTER_SITES= ${MASTER_SITE_GCC} MASTER_SITE_SUBDIR= snapshots/${VERSIONSTRING} -DISTNAME= gcc-${VERSIONSTRING} +DISTFILES= gcc-${VERSIONSTRING}${EXTRACT_SUFX} MAINTAINER= gerald@FreeBSD.org COMMENT= GNU Compiler Collection 4.8 LIB_DEPENDS= gmp:${PORTSDIR}/math/gmp \ mpfr:${PORTSDIR}/math/mpfr \ mpc:${PORTSDIR}/math/mpc RUN_DEPENDS+= ${LOCALBASE}/bin/as:${PORTSDIR}/devel/binutils .if defined(MAINTAINER_MODE) BUILD_DEPENDS+= runtest:${PORTSDIR}/misc/dejagnu .endif # VERSIONSTRING relates to downloads, GCC_VERSION and SUFFIX to names # of executables and directories once installed. VERSIONSTRING= ${PORTVERSION:C/([0-9]+\.[0-9]+).*\.([0-9]+)/\1-\2/} GCC_VERSION= ${PORTVERSION:C/(.+)\.[0-9]{8}/\1/} SUFFIX= ${PORTVERSION:C/([0-9]+).([0-9]+).*/\1\2/} LATEST_LINK= gcc${SUFFIX}${PKGNAMESUFFIX} ONLY_FOR_ARCHS= amd64 i386 powerpc powerpc64 sparc64 USE_BINUTILS= yes USE_BISON= build USE_BZIP2= yes USE_GMAKE= yes USE_ICONV= yes USE_PERL5_BUILD=yes MAKE_JOBS_SAFE= yes PATCH_WRKSRC= ${SRCDIR} CONFIGURE_SCRIPT= ../${SRCDIR:S/${WRKDIR}\///}/configure OPTIONS_DEFINE_i386= JAVA OPTIONS_DEFINE_amd64= JAVA OPTIONS_DEFAULT_i386= JAVA OPTIONS_DEFAULT_amd64= JAVA .include .if ${ARCH} == "amd64" CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL} .else CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL} .endif .if ${ARCH} == powerpc64 CONFIGURE_ENV+= UNAME_m="powerpc64" .endif LANGUAGES:= c,c++,objc,fortran SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING} WRKSRC= ${WRKDIR}/build TARGLIB= ${PREFIX}/lib/gcc${SUFFIX} LIBEXEC= ${PREFIX}/libexec/gcc${SUFFIX} GNU_CONFIGURE= yes CFLAGS+= -I${LOCALBASE}/include CONFIGURE_ARGS+=--disable-nls \ --libdir=${TARGLIB} \ --libexecdir=${LIBEXEC} \ --program-suffix=${SUFFIX} \ --with-as=${LOCALBASE}/bin/as \ --with-gmp=${LOCALBASE} \ --with-gxx-include-dir=${TARGLIB}/include/c++/ \ --with-ld=${LOCALBASE}/bin/ld \ --with-libiconv-prefix=${LOCALBASE} \ --with-pkgversion="FreeBSD Ports Collection" \ --with-system-zlib MAKE_ARGS+= MAKEINFOFLAGS="--no-split" ALL_TARGET= bootstrap-lean USE_LDCONFIG= ${TARGLIB} PLIST_SUB= GCC_VERSION=${GCC_VERSION} \ GNU_HOST=${CONFIGURE_TARGET} \ SUFFIX=${SUFFIX} MAN1= cpp${SUFFIX}.1 \ g++${SUFFIX}.1 \ gcc${SUFFIX}.1 \ gcov${SUFFIX}.1 \ gfortran${SUFFIX}.1 INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/cppinternals \ gcc${SUFFIX}/gcc \ gcc${SUFFIX}/gccinstall \ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ gcc${SUFFIX}/libgomp .if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "alpha" INFO+= gcc${SUFFIX}/libquadmath \ gcc${SUFFIX}/libitm .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 EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier LANGUAGES:= ${LANGUAGES},java MAN1+= aot-compile${SUFFIX}.1 \ gappletviewer${SUFFIX}.1 \ gc-analyze${SUFFIX}.1 \ gcj${SUFFIX}.1 \ gcj-dbtool${SUFFIX}.1 \ gcjh${SUFFIX}.1 \ gij${SUFFIX}.1 \ gjar${SUFFIX}.1 \ gjarsigner${SUFFIX}.1 \ gjavah${SUFFIX}.1 \ gjdoc${SUFFIX}.1 \ gkeytool${SUFFIX}.1 \ gnative2ascii${SUFFIX}.1 \ gorbd${SUFFIX}.1 \ grmic${SUFFIX}.1 \ grmid${SUFFIX}.1 \ grmiregistry${SUFFIX}.1 \ gserialver${SUFFIX}.1 \ gtnameserv${SUFFIX}.1 \ jcf-dump${SUFFIX}.1 \ jv-convert${SUFFIX}.1 \ rebuild-gcj-db${SUFFIX}.1 MAN3= ffi${SUFFIX}.3 \ ffi_call${SUFFIX}.3 \ ffi_prep_cif${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 " .endif CONFIGURE_ARGS+=--enable-languages=${LANGUAGES} pre-everything:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" pre-configure: cd ${SRCDIR} ; contrib/gcc_update --touch @${RM} -f ${SRCDIR}/gcc/*/*.info* @${MKDIR} ${CONFIGURE_WRKSRC} .if defined(MAINTAINER_MODE) full-regression-test: build cd ${WRKSRC}; ${GMAKE} -sk check .endif post-install: ${RM} -f ${PREFIX}/man/man7/fsf-funding.7 \ ${PREFIX}/man/man7/gfdl.7 ${PREFIX}/man/man7/gpl.7 ${RM} -f ${TARGLIB}/*.la # Add target libraries and include files to packaging list. ${RM} -f ${WRKDIR}/PLIST.lib .for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax cd ${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ ${FIND} $d -type d | ${SORT} -r \ | ${SED} -e 's/^/@dirrm /g' >>${WRKDIR}/PLIST.lib ;\ fi .endfor cd ${WRKDIR} ; ${SED} -i -e "/PLIST.lib/ r PLIST.lib" ${TMPPLIST} @if type ccache-update-links >/dev/null 2>&1; then \ ccache-update-links -v; \ fi .include Index: head/lang/gcc48/distinfo =================================================================== --- head/lang/gcc48/distinfo (revision 306818) +++ head/lang/gcc48/distinfo (revision 306819) @@ -1,2 +1,4 @@ -SHA256 (gcc-4.8-20120930.tar.bz2) = a5fe63ac539933edc9912394a6755f53d914e53ca63f0cc0eea6aa9753838189 -SIZE (gcc-4.8-20120930.tar.bz2) = 79806276 +SHA256 (gcc-4.8-20121014.tar.bz2) = a9476fad0ac588140ddd6761eacc09e688cfe8798df37e0022dd7ab756d54ff4 +SIZE (gcc-4.8-20121014.tar.bz2) = 79933547 +SHA256 (ecj-4.5.jar) = 98fd128f1d374d9e42fd9d4836bdd249c6d511ebc6c0df17fbc1b9df96c3d781 +SIZE (ecj-4.5.jar) = 1470676 Index: head/lang/gcc48/pkg-plist =================================================================== --- head/lang/gcc48/pkg-plist (revision 306818) +++ head/lang/gcc48/pkg-plist (revision 306819) @@ -1,57 +1,58 @@ @comment $FreeBSD$ bin/%%GNU_HOST%%-c++%%SUFFIX%% bin/%%GNU_HOST%%-g++%%SUFFIX%% bin/%%GNU_HOST%%-gcc%%SUFFIX%% bin/%%GNU_HOST%%-gcc-%%GCC_VERSION%% bin/%%GNU_HOST%%-gcc-ar%%SUFFIX%% bin/%%GNU_HOST%%-gcc-nm%%SUFFIX%% bin/%%GNU_HOST%%-gcc-ranlib%%SUFFIX%% bin/%%GNU_HOST%%-gfortran%%SUFFIX%% bin/c++%%SUFFIX%% bin/cpp%%SUFFIX%% bin/g++%%SUFFIX%% bin/gcc%%SUFFIX%% bin/gcc-ar%%SUFFIX%% bin/gcc-nm%%SUFFIX%% bin/gcc-ranlib%%SUFFIX%% bin/gcov%%SUFFIX%% bin/gfortran%%SUFFIX%% info/gcc%%SUFFIX%%/dir %%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/aotcompile.py %%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/classfile.py %%JAVA%%@dirrm share/gcc-%%GCC_VERSION%%/python/libjava share/gcc-%%GCC_VERSION%%/python/libstdcxx/__init__.py share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/__init__.py share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/printers.py @dirrm share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6 @dirrm share/gcc-%%GCC_VERSION%%/python/libstdcxx @dirrm share/gcc-%%GCC_VERSION%%/python @dirrm share/gcc-%%GCC_VERSION%% %%JAVA%%bin/%%GNU_HOST%%-gcj%%SUFFIX%% %%JAVA%%bin/aot-compile%%SUFFIX%% %%JAVA%%bin/gappletviewer%%SUFFIX%% %%JAVA%%bin/gc-analyze%%SUFFIX%% %%JAVA%%bin/gcj%%SUFFIX%% %%JAVA%%bin/gcj-dbtool%%SUFFIX%% %%JAVA%%bin/gcjh%%SUFFIX%% %%JAVA%%bin/gij%%SUFFIX%% %%JAVA%%bin/gjar%%SUFFIX%% %%JAVA%%bin/gjarsigner%%SUFFIX%% %%JAVA%%bin/gjavah%%SUFFIX%% %%JAVA%%bin/gkeytool%%SUFFIX%% %%JAVA%%bin/gnative2ascii%%SUFFIX%% %%JAVA%%bin/gorbd%%SUFFIX%% %%JAVA%%bin/grmic%%SUFFIX%% %%JAVA%%bin/grmid%%SUFFIX%% %%JAVA%%bin/grmiregistry%%SUFFIX%% %%JAVA%%bin/gserialver%%SUFFIX%% %%JAVA%%bin/gtnameserv%%SUFFIX%% %%JAVA%%bin/jcf-dump%%SUFFIX%% %%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 @unexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi @comment Insert PLIST.lib here