Date: Sat, 15 Apr 2017 06:39:48 +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: r438577 - in head/lang/gcc46: . files Message-ID: <201704150639.v3F6dmFD073186@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: gerald Date: Sat Apr 15 06:39:48 2017 New Revision: 438577 URL: https://svnweb.freebsd.org/changeset/ports/438577 Log: Remove Java support (the JAVA option and CATEGORY) from this port. Four years after GCC 4.6 went end-of-life upstream there isn't really much use of that any more since newer ports still carry it, and it speeds up build and simplifies this port significantly. In addition to the expected changes to Makefile, pkg-plist, and pkg-descr this also gets rid of files/java-patch-hier. Deleted: head/lang/gcc46/files/java-patch-hier Modified: head/lang/gcc46/Makefile head/lang/gcc46/pkg-descr head/lang/gcc46/pkg-plist Modified: head/lang/gcc46/Makefile ============================================================================== --- head/lang/gcc46/Makefile Sat Apr 15 05:41:23 2017 (r438576) +++ head/lang/gcc46/Makefile Sat Apr 15 06:39:48 2017 (r438577) @@ -3,9 +3,9 @@ PORTNAME= gcc PORTVERSION= 4.6.4 -PORTREVISION= 6 +PORTREVISION= 7 PORTEPOCH= 1 -CATEGORIES= lang java +CATEGORIES= lang MASTER_SITES= GCC/releases/gcc-${PORTVERSION} PKGNAMESUFFIX= ${SUFFIX} @@ -38,16 +38,8 @@ USE_PERL5= build SSP_UNSAFE= yes OPTIONS_DEFINE= BOOTSTRAP -OPTIONS_DEFINE_i386= JAVA -OPTIONS_DEFINE_amd64= JAVA -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 - .include <bsd.port.pre.mk> .if ${ARCH} == "amd64" @@ -75,7 +67,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} \ @@ -93,23 +87,6 @@ INFO= gcc${SUFFIX}/cpp \ INFO+= gcc${SUFFIX}/libquadmath #.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:: @${ECHO_MSG} "Making GCC ${PORTVERSION} for ${CONFIGURE_TARGET} [${LANGUAGES}]" @@ -125,11 +102,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/gcc46/pkg-descr ============================================================================== --- head/lang/gcc46/pkg-descr Sat Apr 15 05:41:23 2017 (r438576) +++ head/lang/gcc46/pkg-descr Sat Apr 15 06:39:48 2017 (r438577) @@ -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 gcc46, g++46, -gfortran46, and gcj46, respectively. +port installs the C, C++, and Fortran front ends as gcc46, g++46, and +gfortran46, respectively. WWW: http://gcc.gnu.org/ Modified: head/lang/gcc46/pkg-plist ============================================================================== --- head/lang/gcc46/pkg-plist Sat Apr 15 05:41:23 2017 (r438576) +++ head/lang/gcc46/pkg-plist Sat Apr 15 06:39:48 2017 (r438577) @@ -15,59 +15,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.6.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%%man/man3/ffi%%SUFFIX%%.3.gz -%%JAVA%%man/man3/ffi_call%%SUFFIX%%.3.gz -%%JAVA%%man/man3/ffi_prep_cif%%SUFFIX%%.3.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?201704150639.v3F6dmFD073186>