Add a WITHOUT_LIBJAVA knob, which disables building libgcj and thus saves

quite some build time and also disk.  Make this the default on sparc64 and
ia64 where libgcj has not been ported to and thus fix long-standing packaging
issues on these two platforms.
On the way, update to the 20040322 snapshot of GCC 3.3.3.

PR:		63427 (mostly)
This commit is contained in:
Gerald Pfeifer 2004-03-28 00:16:07 +00:00
parent 956cb90c96
commit 5bab905509
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=105462
3 changed files with 48 additions and 40 deletions

View File

@ -5,7 +5,7 @@
#
# $FreeBSD$
#
SNAPDATE= 2004-03-08
SNAPDATE= 2004-03-22
PORTNAME= gcc
PORTVERSION= 3.3.4
@ -48,16 +48,16 @@ NOMANCOMPRESS= yes # too hard to deal with differences on 5-cur and releng4
.include <bsd.port.pre.mk>
.if ${ARCH} == sparc64
BROKEN= "libgcj is not supported/packaging is broken on this platform"
.endif
.if ${ARCH} == "amd64"
CONFIGURE_TARGET= x86_64-portbld-freebsd${OSREL}
.else
CONFIGURE_TARGET= ${ARCH}-portbld-freebsd${OSREL}
.endif
.if ${ARCH} == ia64 || ${ARCH} == sparc64
WITHOUT_LIBJAVA= yes
.endif
SRCDIR= ${WRKDIR}/gcc-${VERSIONSTRING}
WRKSRC= ${WRKDIR}/build
SUFFIX= 33
@ -94,6 +94,13 @@ MAN1= cpp${SUFFIX}.1 \
MAN7= fsf-funding.7 gfdl.7 gpl.7
INFO= cpp cppinternals g77 gcc gccint gcj fastjar
.if defined(WITHOUT_LIBJAVA)
CONFIGURE_ARGS+= --disable-libgcj
PLIST_SUB+= LIBJAVA="@comment "
.else
PLIST_SUB+= LIBJAVA=""
.endif
pre-everything::
@${ECHO_MSG} "Making GCC ${DISTNAME:S/^gcc-//} for ${OPSYS} ${OSREL} ${PORTOBJFORMAT} target ${CONFIGURE_TARGET}"
.if !defined(WITH_BOUNDSCHECKING)
@ -140,9 +147,10 @@ post-install: fake-manpages
# gij and jv-convert, for example, are not built on all platforms.
if [ -e ${PREFIX}/bin/${f}${SUFFIX} ]; then \
${STRIP_CMD} ${PREFIX}/bin/${f}${SUFFIX}; \
( ${TEST} ! -e ${PREFIX}/man/man1/${f}.1 \
|| ${MV} -f ${PREFIX}/man/man1/${f}.1 \
${PREFIX}/man/man1/${f}${SUFFIX}.1 ); \
fi
if [ -e ${PREFIX}/man/man1/${f}.1 ]; then \
${MV} -f ${PREFIX}/man/man1/${f}.1 \
${PREFIX}/man/man1/${f}${SUFFIX}.1; \
fi
.endfor
${MV} -f ${PREFIX}/bin/g77${SUFFIX} ${PREFIX}/bin/g77-${SUFFIX}

View File

@ -1,12 +1,12 @@
MD5 (gcc-core-3.3-20040308.tar.bz2) = c26dc4cb129188d2118c199a85a7a22a
SIZE (gcc-core-3.3-20040308.tar.bz2) = 9899267
MD5 (gcc-g++-3.3-20040308.tar.bz2) = 0a8f702d507c6e48fc6b836fbfcb2c1f
SIZE (gcc-g++-3.3-20040308.tar.bz2) = 2006689
MD5 (gcc-g77-3.3-20040308.tar.bz2) = 542bfbdc2a46ac99810ad14d79463e80
SIZE (gcc-g77-3.3-20040308.tar.bz2) = 905490
MD5 (gcc-java-3.3-20040308.tar.bz2) = 635f1c139d6384a4c53f00957f3d32ae
SIZE (gcc-java-3.3-20040308.tar.bz2) = 3445673
MD5 (gcc-objc-3.3-20040308.tar.bz2) = 88b68b9b6f2094b0b0f8b07819a575e5
SIZE (gcc-objc-3.3-20040308.tar.bz2) = 141101
MD5 (gcc-testsuite-3.3-20040308.tar.bz2) = 755efa611810e0392606407e5f200aab
SIZE (gcc-testsuite-3.3-20040308.tar.bz2) = 1079147
MD5 (gcc-core-3.3-20040322.tar.bz2) = ea9c6f78e13c8aa0099a57fb600b20f2
SIZE (gcc-core-3.3-20040322.tar.bz2) = 9903212
MD5 (gcc-g++-3.3-20040322.tar.bz2) = 0a52bc17df493111a005bdbae1bf7d36
SIZE (gcc-g++-3.3-20040322.tar.bz2) = 2007863
MD5 (gcc-g77-3.3-20040322.tar.bz2) = de4cc2be8a5bc95a98a6fcc96bc01333
SIZE (gcc-g77-3.3-20040322.tar.bz2) = 905036
MD5 (gcc-java-3.3-20040322.tar.bz2) = 92686a34e18482df5a9b92c376515cf8
SIZE (gcc-java-3.3-20040322.tar.bz2) = 3445707
MD5 (gcc-objc-3.3-20040322.tar.bz2) = 9f0d78bf01511af6ce816a832be716d2
SIZE (gcc-objc-3.3-20040322.tar.bz2) = 141163
MD5 (gcc-testsuite-3.3-20040322.tar.bz2) = 7cc22dfa2ad3ad6a221140f6396536f2
SIZE (gcc-testsuite-3.3-20040322.tar.bz2) = 1080524

View File

@ -13,30 +13,30 @@ bin/%%GNU_HOST%%-gcj33
bin/gccbug33
bin/gcj33
bin/gcjh33
bin/gij33
%%LIBJAVA%%bin/gij33
bin/jv-scan33
bin/jcf-dump33
bin/jv-convert33
%%LIBJAVA%%bin/jv-convert33
bin/jar33
bin/grepjar33
bin/rmic33
bin/rmiregistry33
bin/addr2name.awk33
include/fficonfig.h
include/ffi.h
include/ffi_mips.h
include/jni.h
include/jvmpi.h
lib/libffi.la
lib/libffi.a
lib/security/classpath.security
lib/security/libgcj.security
@dirrm lib/security
lib/lib-org-xml-sax.la
lib/lib-org-xml-sax.a
lib/lib-org-w3c-dom.la
lib/lib-org-w3c-dom.a
share/java/libgcj-%%GCC_VER%%.jar
%%LIBJAVA%%bin/rmic33
%%LIBJAVA%%bin/rmiregistry33
%%LIBJAVA%%bin/addr2name.awk33
%%LIBJAVA%%include/fficonfig.h
%%LIBJAVA%%include/ffi.h
%%LIBJAVA%%include/ffi_mips.h
%%LIBJAVA%%include/jni.h
%%LIBJAVA%%include/jvmpi.h
%%LIBJAVA%%lib/libffi.la
%%LIBJAVA%%lib/libffi.a
%%LIBJAVA%%lib/security/classpath.security
%%LIBJAVA%%lib/security/libgcj.security
%%LIBJAVA%%@dirrm lib/security
%%LIBJAVA%%lib/lib-org-xml-sax.la
%%LIBJAVA%%lib/lib-org-xml-sax.a
%%LIBJAVA%%lib/lib-org-w3c-dom.la
%%LIBJAVA%%lib/lib-org-w3c-dom.a
%%LIBJAVA%%share/java/libgcj-%%GCC_VER%%.jar
@comment Insert PLIST.lib here
@comment -=[ begin PLIST.lib ]=-
@comment -=[ end PLIST.lib ]=-