Date: Mon, 1 May 2017 08:15:32 +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: r439859 - in head/lang/gcc49: . files Message-ID: <201705010815.v418FWLV041807@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Mon May 1 08:15:32 2017 New Revision: 439859 URL: https://svnweb.freebsd.org/changeset/ports/439859 Log: Remove Java support (both in terms of the JAVA option and everything associated with it as well as java from CATEGORIES). In addition to changes to Makefile, pkg-plist, and pkg-descr, this also removes files/java-patch-hier. GCC 4.9 was first released in summer 2014 and went end-of-life upstream a year ago, but GCC 5 is very well established by now and also provides support for Java (GCJ/libgcj), and so does GCC 6, and this simplifies this port significantly and also speeds up the build. While we are here, streamline the setting of INFO. Deleted: head/lang/gcc49/files/java-patch-hier Modified: head/lang/gcc49/Makefile head/lang/gcc49/pkg-descr head/lang/gcc49/pkg-plist Modified: head/lang/gcc49/Makefile ============================================================================== --- head/lang/gcc49/Makefile Mon May 1 01:54:13 2017 (r439858) +++ head/lang/gcc49/Makefile Mon May 1 08:15:32 2017 (r439859) @@ -3,8 +3,8 @@ PORTNAME= gcc PORTVERSION= 4.9.4 -PORTREVISION= 2 -CATEGORIES= lang java +PORTREVISION= 3 +CATEGORIES= lang MASTER_SITES= GCC/releases/gcc-${DISTVERSION} PKGNAMESUFFIX= ${SUFFIX} @@ -37,18 +37,9 @@ USE_PERL5= build SSP_UNSAFE= yes OPTIONS_DEFINE= BOOTSTRAP -OPTIONS_DEFINE_i386= JAVA -OPTIONS_DEFINE_amd64= JAVA -OPTIONS_DEFINE_powerpc64= JAVA OPTIONS_DEFAULT= BOOTSTRAP -OPTIONS_DEFAULT_i386= JAVA -OPTIONS_DEFAULT_amd64= JAVA -OPTIONS_EXCLUDE_DragonFly= JAVA BOOTSTRAP_DESC= Build using a full bootstrap -JAVA_USES= python:build shebangfix -SHEBANG_FILES= libjava/contrib/aot-compile.in - .if exists(/usr/lib32/libc.so) OPTIONS_DEFINE_powerpc64+= MULTILIB OPTIONS_DEFAULT_powerpc64+= MULTILIB @@ -102,7 +93,9 @@ CONFIGURE_ARGS+=--disable-nls \ --with-ld=${LOCALBASE}/bin/ld \ ${ICONV_CONFIGURE_ARG} \ --with-pkgversion="FreeBSD Ports Collection" \ - --with-system-zlib + --with-system-zlib \ + --disable-libgcj \ + --enable-languages=${LANGUAGES} MAKE_ARGS+= MAKEINFOFLAGS="--no-split" USE_LDCONFIG= ${TARGLIB} PLIST_SUB= GCC_VERSION=${GCC_VERSION} \ @@ -114,35 +107,12 @@ INFO= gcc${SUFFIX}/cpp \ gcc${SUFFIX}/gccinstall \ gcc${SUFFIX}/gccint \ gcc${SUFFIX}/gfortran \ - gcc${SUFFIX}/libgomp -# Release tarballs (as opposed to snapshots) always carry this. -#.if ${ARCH} == "i386" || ${ARCH} == "amd64" -INFO+= gcc${SUFFIX}/libquadmath -#.endif -.if ${ARCH} == "i386" || ${ARCH} == "amd64" || ${ARCH} == "armv6" -INFO+= gcc${SUFFIX}/libitm -.endif - + gcc${SUFFIX}/libgomp \ + gcc${SUFFIX}/libitm \ + gcc${SUFFIX}/libquadmath SUB_FILES= pkg-message SUB_LIST+= TARGLIB=${TARGLIB} -.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:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" @@ -158,11 +128,9 @@ 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 # 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/gcc49/pkg-descr ============================================================================== --- head/lang/gcc49/pkg-descr Mon May 1 01:54:13 2017 (r439858) +++ head/lang/gcc49/pkg-descr Mon May 1 08:15:32 2017 (r439859) @@ -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 gcc49, g++49, -gfortran49, and gcj49, respectively. +port installs the C, C++, and Fortran front ends as gcc49, g++49, and +gfortran49, respectively. WWW: http://gcc.gnu.org/ Modified: head/lang/gcc49/pkg-plist ============================================================================== --- head/lang/gcc49/pkg-plist Mon May 1 01:54:13 2017 (r439858) +++ head/lang/gcc49/pkg-plist Mon May 1 08:15:32 2017 (r439859) @@ -21,56 +21,9 @@ man/man1/g++%%SUFFIX%%.1.gz man/man1/gcc%%SUFFIX%%.1.gz man/man1/gcov%%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 -%%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-4.9.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?201705010815.v418FWLV041807>