cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove Java support (both in terms of the JAVA option and everything

Browse Source 
associated with it as well as java from CATEGORIES) from this port.

Technically GCC 4.8 only went end-of-life upstream in June 2015, alas
GCC 4.9 and GCC 5 are well established by now and also provide support
for Java (GCJ/libgcj), and this change simplifies this port significantly
and speeds up the build.

In addition to the expected changes to Makefile, pkg-plist, and pkg-descr,
this also removes files/java-patch-hier.
This commit is contained in:
Gerald Pfeifer 2017-04-22 08:50:18 +00:00
parent 1255d48093
commit fda2c67324
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=439140
4 changed files with 8 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lang/gcc48/Makefile
View File

@ -3,8 +3,8 @@
PORTNAME= gcc
PORTVERSION= 4.8.5
PORTREVISION= 2
CATEGORIES= lang java
PORTREVISION= 3
CATEGORIES= lang
MASTER_SITES= GCC/releases/gcc-${PORTVERSION}
PKGNAMESUFFIX= ${SUFFIX}
@ -37,17 +37,9 @@ USE_PERL5= build
SSP_UNSAFE= yes
OPTIONS_DEFINE= BOOTSTRAP
OPTIONS_DEFINE_i386= JAVA
OPTIONS_DEFINE_amd64= 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
@ -101,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} \
@ -122,23 +116,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}]"
@ -154,11 +131,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

13
lang/gcc48/files/java-patch-hier
View File

@ -1,13 +0,0 @@
Index: libjava/Makefile.in
===================================================================
--- libjava/Makefile.in (revision 117734)
+++ libjava/Makefile.in (working copy)
@@ -712,7 +712,7 @@
$(am__append_2) $(am__append_3)
toolexecmainlib_DATA = libgcj.spec
dbexec_LTLIBRARIES = libjvm.la
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(prefix)/libdata/pkgconfig
jardir = $(datadir)/java
jar_DATA = libgcj-$(gcc_version).jar libgcj-tools-$(gcc_version).jar
@JAVA_HOME_SET_FALSE@JAVA_HOME_DIR = $(prefix)

4
lang/gcc48/pkg-descr
View File

@ -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 gcc48, g++48,
gfortran48, and gcj48, respectively.
port installs the C, C++, and Fortran front ends as gcc48, g++48, and
gfortran48, respectively.
WWW: http://gcc.gnu.org/

47
lang/gcc48/pkg-plist
View File

@ -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.8.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