svn commit: r450304 - in head/lang/gcc5: . files
Gerald Pfeifer
gerald at FreeBSD.org
Thu Sep 21 20:38:40 UTC 2017
Author: gerald
Date: Thu Sep 21 20:38:38 2017
New Revision: 450304
URL: https://svnweb.freebsd.org/changeset/ports/450304
Log:
Now that the default version of GCC in the tree is GCC 6 (the lang/gcc6
port), remove Java support (incl. the JAVA option) from lang/gcc5. Only
one other port actually relies on this and this change speeds up the build
and reduces the size of this port/package quite a bit.
Deleted:
head/lang/gcc5/files/java-patch-hier
Modified:
head/lang/gcc5/Makefile
head/lang/gcc5/pkg-descr
head/lang/gcc5/pkg-plist
Modified: head/lang/gcc5/Makefile
==============================================================================
--- head/lang/gcc5/Makefile Thu Sep 21 20:28:13 2017 (r450303)
+++ head/lang/gcc5/Makefile Thu Sep 21 20:38:38 2017 (r450304)
@@ -3,8 +3,8 @@
PORTNAME= gcc
PORTVERSION= 5.4.0
-PORTREVISION= 3
-CATEGORIES= lang java
+PORTREVISION= 4
+CATEGORIES= lang
MASTER_SITES= GCC/releases/gcc-${DISTVERSION}
PKGNAMESUFFIX= ${SUFFIX}
@@ -38,19 +38,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_DEFAULT_i386= JAVA
-OPTIONS_DEFAULT_amd64= JAVA
-OPTIONS_EXCLUDE_DragonFly= JAVA
BOOTSTRAP_DESC= Build using a full bootstrap
GRAPHITE_DESC= Support for Graphite loop optimizations
-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
@@ -92,6 +83,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} \
@@ -114,10 +106,9 @@ 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.
-INFO+= gcc${SUFFIX}/libquadmath \
- gcc${SUFFIX}/libitm
+ gcc${SUFFIX}/libgomp \
+ gcc${SUFFIX}/libitm \
+ gcc${SUFFIX}/libquadmath
SUB_FILES= pkg-message
SUB_LIST+= TARGLIB=${TARGLIB}
@@ -126,21 +117,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::
@@ -158,12 +134,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/pkg-descr
==============================================================================
--- head/lang/gcc5/pkg-descr Thu Sep 21 20:28:13 2017 (r450303)
+++ head/lang/gcc5/pkg-descr Thu Sep 21 20:38:38 2017 (r450304)
@@ -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/pkg-plist
==============================================================================
--- head/lang/gcc5/pkg-plist Thu Sep 21 20:28:13 2017 (r450303)
+++ head/lang/gcc5/pkg-plist Thu Sep 21 20:38:38 2017 (r450304)
@@ -21,57 +21,10 @@ 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
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
More information about the svn-ports-head
mailing list