svn commit: r438673 - in head/lang/gcc47: . files

Gerald Pfeifer gerald at FreeBSD.org
Sun Apr 16 21:19:35 UTC 2017 

Author: gerald
Date: Sun Apr 16 21:19:33 2017
New Revision: 438673
URL: https://svnweb.freebsd.org/changeset/ports/438673

Log:
  Remove Java support (both the JAVA option and everything associated with
  it as well as java from CATEGORIES) from this port.
  
  After GCC 4.7 went end-of-life upstream in June 2014 there isn't much
  use of that not better served by newer lang/gcc* ports and it speeds up
  the build and simplifies this port significantly.
  
  In addition to the expected changes to Makefile, pkg-plist, and pkg-descr,
  this also removes files/java-patch-hier.

Deleted:
  head/lang/gcc47/files/java-patch-hier
Modified:
  head/lang/gcc47/Makefile
  head/lang/gcc47/pkg-descr
  head/lang/gcc47/pkg-plist

Modified: head/lang/gcc47/Makefile
==============================================================================
--- head/lang/gcc47/Makefile	Sun Apr 16 20:24:46 2017	(r438672)
+++ head/lang/gcc47/Makefile	Sun Apr 16 21:19:33 2017	(r438673)
@@ -5,7 +5,7 @@ PORTNAME=	gcc
 PORTVERSION=	4.7.4
 PORTREVISION=	4
 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"
@@ -80,7 +72,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} \
@@ -101,23 +95,6 @@ INFO+=		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}]"
 
@@ -133,11 +110,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/gcc47/pkg-descr
==============================================================================
--- head/lang/gcc47/pkg-descr	Sun Apr 16 20:24:46 2017	(r438672)
+++ head/lang/gcc47/pkg-descr	Sun Apr 16 21:19:33 2017	(r438673)
@@ -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 gcc47, g++47,
-gfortran47, and gcj47, respectively.
+port installs the C, C++, and Fortran front ends as gcc47, g++47, and
+gfortran47, respectively.
 
 WWW: http://gcc.gnu.org/
 

Modified: head/lang/gcc47/pkg-plist
==============================================================================
--- head/lang/gcc47/pkg-plist	Sun Apr 16 20:24:46 2017	(r438672)
+++ head/lang/gcc47/pkg-plist	Sun Apr 16 21:19:33 2017	(r438673)
@@ -21,59 +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.7.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

More information about the svn-ports-head mailing list