Date: Fri, 22 Sep 2017 05:47:29 +0000 (UTC) From: Gerald Pfeifer <gerald@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r450316 - in head/lang/gcc5-devel: . files Message-ID: <201709220547.v8M5lTvK060157@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Fri Sep 22 05:47:29 2017 New Revision: 450316 URL: https://svnweb.freebsd.org/changeset/ports/450316 Log: Update to the 20170919 snapshot of GCC 5.4.1. Like with lang/gcc5, now that the default version of GCC in the tree is GCC 6, remove Java support (incl. the JAVA option) from this port after we disabled this by default with r442910 three months ago already. Deleted: head/lang/gcc5-devel/files/java-patch-hier Modified: head/lang/gcc5-devel/Makefile head/lang/gcc5-devel/distinfo head/lang/gcc5-devel/pkg-descr head/lang/gcc5-devel/pkg-plist Modified: head/lang/gcc5-devel/Makefile ============================================================================== --- head/lang/gcc5-devel/Makefile Fri Sep 22 04:56:37 2017 (r450315) +++ head/lang/gcc5-devel/Makefile Fri Sep 22 05:47:29 2017 (r450316) @@ -2,8 +2,8 @@ # $FreeBSD$ PORTNAME= gcc -PORTVERSION= 5.4.1.s20170912 -CATEGORIES= lang java +PORTVERSION= 5.4.1.s20170919 +CATEGORIES= lang MASTER_SITES= GCC/snapshots/${DIST_VERSION} PKGNAMESUFFIX= ${SUFFIX}-devel DISTNAME= gcc-${DIST_VERSION} @@ -43,17 +43,10 @@ USE_PERL5= build SSP_UNSAFE= yes OPTIONS_DEFINE= BOOTSTRAP GRAPHITE -OPTIONS_DEFINE_i386= JAVA -OPTIONS_DEFINE_amd64= JAVA -OPTIONS_DEFINE_powerpc64= JAVA OPTIONS_DEFAULT= BOOTSTRAP -OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap GRAPHITE_DESC= Support for Graphite loop optimizations -JAVA_USES= python shebangfix -SHEBANG_FILES= libjava/contrib/aot-compile.in - .if exists(/usr/lib32/libc.so) OPTIONS_DEFINE_powerpc64+= MULTILIB OPTIONS_DEFAULT_powerpc64+= MULTILIB @@ -95,6 +88,7 @@ CONFIGURE_ARGS+=--with-build-config=bootstrap-debug ALL_TARGET= bootstrap-lean .endif CONFIGURE_ARGS+=--disable-nls \ + --disable-libgcj \ --enable-gnu-indirect-function \ --libdir=${TARGLIB} \ --libexecdir=${LIBEXEC} \ @@ -130,21 +124,6 @@ LIB_DEPENDS+= libisl.so:devel/isl CONFIGURE_ARGS+=--with-isl=${LOCALBASE} .endif -.if ${PORT_OPTIONS:MJAVA} -ECJ_JAR= ${LOCALBASE}/share/java/ecj-4.5.jar -BUILD_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 \ - zip:archivers/zip -RUN_DEPENDS+= ${ECJ_JAR}:lang/gcc-ecj45 -EXTRA_PATCHES+= ${FILESDIR}/java-patch-hier -CONFIGURE_ARGS+=--with-ecj-jar=${ECJ_JAR} -LANGUAGES:= ${LANGUAGES},java -INFO+= gcc${SUFFIX}/cp-tools \ - gcc${SUFFIX}/gcj -PLIST_SUB+= JAVA="" -.else -CONFIGURE_ARGS+=--disable-libgcj -PLIST_SUB+= JAVA="@comment " -.endif CONFIGURE_ARGS+=--enable-languages=${LANGUAGES} pre-everything:: @@ -162,12 +141,10 @@ full-regression-test: build post-stage: ${RM} ${STAGEDIR}${PREFIX}/man/man7/* - ${RM} ${STAGEDIR}${PREFIX}/bin/rebuild-gcj-db${SUFFIX} \ - ${STAGEDIR}${PREFIX}/man/man1/rebuild-gcj-db${SUFFIX}.1 ${RM} -r ${STAGEDIR}${TARGLIB}/gcc/*/${GCC_VERSION}/include-fixed/ # Add target libraries and include files to packaging list. ${RM} ${WRKDIR}/PLIST.lib -.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} include/gcj include/gnu include/java include/javax +.for d in ${TARGLIB:S/^${PREFIX}\///} ${LIBEXEC:S/^${PREFIX}\///} cd ${STAGEDIR}${PREFIX} ; if [ -d $d ]; then \ ${FIND} $d -type f -o -type l >>${WRKDIR}/PLIST.lib ;\ fi Modified: head/lang/gcc5-devel/distinfo ============================================================================== --- head/lang/gcc5-devel/distinfo Fri Sep 22 04:56:37 2017 (r450315) +++ head/lang/gcc5-devel/distinfo Fri Sep 22 05:47:29 2017 (r450316) @@ -1,3 +1,3 @@ -TIMESTAMP = 1505393361 -SHA256 (gcc-5-20170912.tar.xz) = 4e0afc2d86fa9bb3b25b64fd9a47ae045a51382fe8baffabcf03df6fddf6ab28 -SIZE (gcc-5-20170912.tar.xz) = 69378940 +TIMESTAMP = 1506026745 +SHA256 (gcc-5-20170919.tar.xz) = d9ab03070d695eed0ab946e2e574d96aa3a3b6cd82c4a4470c4f427e23bb9cad +SIZE (gcc-5-20170919.tar.xz) = 69384604 Modified: head/lang/gcc5-devel/pkg-descr ============================================================================== --- head/lang/gcc5-devel/pkg-descr Fri Sep 22 04:56:37 2017 (r450315) +++ head/lang/gcc5-devel/pkg-descr Fri Sep 22 05:47:29 2017 (r450316) @@ -1,6 +1,6 @@ -GCC, the GNU Compiler Collection, supports a number of languages. This -port installs the C, C++, Fortran and Java front ends as gcc5, g++5, -gfortran5, and gcj5, respectively. +GCC, the GNU Compiler Collection, supports a number of languages. +This port installs the C, C++, and Fortran front ends as gcc5, g++5, +and gfortran5, respectively. WWW: https://gcc.gnu.org Modified: head/lang/gcc5-devel/pkg-plist ============================================================================== --- head/lang/gcc5-devel/pkg-plist Fri Sep 22 04:56:37 2017 (r450315) +++ head/lang/gcc5-devel/pkg-plist Fri Sep 22 05:47:29 2017 (r450316) @@ -24,57 +24,10 @@ man/man1/gcov%%SUFFIX%%.1.gz man/man1/gcov-dump%%SUFFIX%%.1.gz man/man1/gcov-tool%%SUFFIX%%.1.gz man/man1/gfortran%%SUFFIX%%.1.gz -%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/aotcompile.py -%%JAVA%%share/gcc-%%GCC_VERSION%%/python/libjava/classfile.py 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 share/gcc-%%GCC_VERSION%%/python/libstdcxx/v6/xmethods.py -%%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%%libdata/pkgconfig/libgcj-5.pc -%%JAVA%%man/man1/aot-compile%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gappletviewer%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gc-analyze%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gcj%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gcj-dbtool%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gcjh%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gij%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gjar%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gjarsigner%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gjavah%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gjdoc%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gkeytool%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gnative2ascii%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gorbd%%SUFFIX%%.1.gz -%%JAVA%%man/man1/grmic%%SUFFIX%%.1.gz -%%JAVA%%man/man1/grmid%%SUFFIX%%.1.gz -%%JAVA%%man/man1/grmiregistry%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gserialver%%SUFFIX%%.1.gz -%%JAVA%%man/man1/gtnameserv%%SUFFIX%%.1.gz -%%JAVA%%man/man1/jcf-dump%%SUFFIX%%.1.gz -%%JAVA%%man/man1/jv-convert%%SUFFIX%%.1.gz -%%JAVA%%share/java/libgcj-%%GCC_VERSION%%.jar -%%JAVA%%share/java/libgcj-tools-%%GCC_VERSION%%.jar @postexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi @postunexec if type ccache-update-links >/dev/null 2>&1; then ccache-update-links -v; fi @comment Insert PLIST.lib here
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201709220547.v8M5lTvK060157>