1) Revised ABI specification (baseline_symbols.txt) to go with release 3.4.1

2) Added include statment for zlib/buildlink3.mk to Makefile to go with
   CONFIGURE_ARGS+=--with-system-zlib already there. Thank you
   Georg Schwarz <geos@epost.de> for pointing out this ommision.
3) Incorporated logic from gcc3 that determines whether to add
   binutils dependency or not.
4) Eliminated hardcoded target of netbsdelf2.0 as a step toward supporting
   other architectures.

4 files changed, 44 insertions, 9 deletions

diff --git a/lang/gcc34/Makefile b/lang/gcc34/Makefile
index 1583ae9e72f..2888682cda5 100644
--- a/lang/gcc34/Makefile
+++ b/lang/gcc34/Makefile
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.5 2004/07/21 16:03:33 shannonjr Exp $
+# $NetBSD: Makefile,v 1.6 2004/07/26 21:55:37 shannonjr Exp $
 #
 
 DISTNAME=	gcc-${GCC_VERSION}
 PKGNAME=	gcc34-${GCC_VERSION}
+PKGREVISION=	1
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GNU:=gcc/gcc-${GCC_VERSION}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -15,6 +16,37 @@ GCC_VERSION=		3.4.1
 
 .include "../../mk/bsd.prefs.mk"
 
+# Determine whether to use binutils
+.if ${OPSYS} == "NetBSD"
+.  if !defined(USE_BINUTILS)
+AS_PATH:=   ${AS}
+.    for _dir_ in ${PATH:C/\:/ /g}
+.      if empty(AS_PATH:M/*)
+.        if exists(${_dir_}/${AS})
+AS_PATH:=   ${_dir_}/${AS}
+.        endif
+.      endif
+.    endfor
+.    if !empty(AS_PATH:M${LOCALBASE}/*)
+USE_BINUTILS=	YES
+.    else
+AS_VERSION!=	${AS} --version | ${AWK} '{				\
+		    split($$3, v, /[.]/);				\
+		    printf "%02d%02d%02d%02d\n",v[1],v[2],v[3],v[4];	\
+		    exit;						\
+		}'
+USE_BINUTILS!=	${TEST} ${AS_VERSION} -lt 02130201 && ${ECHO} YES || ${ECHO} NO
+.    endif
+MAKEFLAGS+=	USE_BINUTILS=${USE_BINUTILS}
+.  endif
+.endif
+.if defined(USE_BINUTILS) && !empty(USE_BINUTILS:M[yY][eE][sS])
+DEPENDS+=	binutils>=2.14:../../devel/binutils
+CONFIGURE_ARGS+=	--with-as=${LOCALBASE}/bin/as
+CONFIGURE_ARGS+=	--with-gnu-as
+CONFIGURE_ARGS+=	--with-gnu-ld
+.endif
+
 # Optional languages - change as required
 #   If BUILD_ADA is YES, then you'll need to specify
 #   an Ada in the "Ada bootstrap compiler section"
@@ -46,10 +78,7 @@ CONFIGURE_ARGS+=	--enable-languages="${LANGS}"
 CONFIGURE_ARGS+=	--with-system-zlib
 CONFIGURE_ARGS+=	--enable-shared
 CONFIGURE_ARGS+=	--enable-__cxa_atexit
-CONFIGURE_ARGS+=	--enable-nls
-CONFIGURE_ARGS+=	--without-included-gettext
 CONFIGURE_ARGS+=	--enable-long-long
-CONFIGURE_ARGS+=	--enable-clocale=generic
 # GNU pth is useless here
 .if !empty(BUILD_ADA:M[Yy][Ee][Ss])
 # ADA tasking strictly requires native threads
@@ -66,6 +95,8 @@ USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 USE_GNU_TOOLS+=		make
 HAS_CONFIGURE=		YES
+CONFIG_SHELL?=		${SH}
+CONFIGURE_ENV+=		CONFIG_SHELL=${CONFIG_SHELL}
 USE_MAKEINFO=		YES
 PLIST_SRC=	${WRKDIR}/PLIST_DYNAMIC
 
@@ -99,12 +130,8 @@ GCC_PREFIX=		${PREFIX}/${GCC_SUBPREFIX}
 FILES_SUBST+=		PKGNAME=${PKGNAME}
 MESSAGE_SUBST+=		GCC_PREFIX=${GCC_PREFIX}
 CONFIGURE_ARGS+=	--prefix=${GCC_PREFIX}
-GCC_PLATFORM=		${MACHINE_GNU_ARCH}--netbsdelf2.0
 CPPFLAGS+=	-I${BUILDLINK_DIR}/include
 CFLAGS+=	-I${BUILDLINK_DIR}/include
-CONFIGURE_ARGS+=	--host=${GCC_PLATFORM}
-GCC_ARCHSUBDIR=	${GCC_SUBPREFIX}/lib/gcc/${GCC_PLATFORM}/${GCC_VERSION}
-GCC_ARCHDIR=	${PREFIX}/${GCC_ARCHSUBDIR}
 
 post-patch:
 .if (${MACHINE_GNU_ARCH} == "x86_64")
@@ -192,5 +219,6 @@ BUILDLINK_DEPMETHOD.gcc3-ada=build
 .  endif
 .endif
 .include "../../converters/libiconv/buildlink3.mk"
+.include "../../devel/zlib/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/gcc34/distinfo b/lang/gcc34/distinfo
index 4c64cd856ad..1a51c89dc70 100644
--- a/lang/gcc34/distinfo
+++ b/lang/gcc34/distinfo
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.3 2004/07/21 16:03:33 shannonjr Exp $
+$NetBSD: distinfo,v 1.4 2004/07/26 21:55:37 shannonjr Exp $
 
 SHA1 (gcc-3.4.1.tar.bz2) = 04de377eff57e614b089b8946a520de0dac7248e
 Size (gcc-3.4.1.tar.bz2) = 27182385 bytes
+SHA1 (patch-function_c) = 64398f40f62ad4c8b9c8f861b802403a4f5aa3be
+SHA1 (patch-libstdc++-v3_configure_host) = f680066ac285cd9cd3fea6713ce3e8a6d0e1c14c
 SHA1 (patch-ae) = 9b9e4ec15815626c81936460ce834303381f001c
 SHA1 (patch-af) = cdd6b0d13c557996cb6582d7fa5dc651d37ee0ee
 SHA1 (patch-ag) = beee5294d387faafa640ab048823499da629e715
diff --git a/lang/gcc34/files/baseline_symbols.txt b/lang/gcc34/files/baseline_symbols.txt
index c09b36176a4..70ee081a31b 100644
--- a/lang/gcc34/files/baseline_symbols.txt
+++ b/lang/gcc34/files/baseline_symbols.txt
@@ -602,6 +602,7 @@ FUNC:_ZNSt11range_errorC2ERKSs@@GLIBCXX_3.4
 FUNC:_ZNSt11range_errorD0Ev@@GLIBCXX_3.4
 FUNC:_ZNSt11range_errorD1Ev@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE2fdEv@@GLIBCXX_3.4
+FUNC:_ZNSt12__basic_fileIcE4fileEv@@GLIBCXX_3.4.1
 FUNC:_ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE4syncEv@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE5closeEv@@GLIBCXX_3.4
@@ -885,6 +886,7 @@ FUNC:_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEEC2ESt13_Ios_Openmode@@G
 FUNC:_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED0Ev@@GLIBCXX_3.4
 FUNC:_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED1Ev@@GLIBCXX_3.4
 FUNC:_ZNSt19basic_ostringstreamIcSt11char_traitsIcESaIcEED2Ev@@GLIBCXX_3.4
+FUNC:_ZNSt19istreambuf_iteratorIcSt11char_traitsIcEEppEv@@GLIBCXX_3.4
 FUNC:_ZNSt5ctypeIcE13classic_tableEv@@GLIBCXX_3.4
 FUNC:_ZNSt5ctypeIcEC1EPKhbj@@GLIBCXX_3.4
 FUNC:_ZNSt5ctypeIcEC1EPiPKhbj@@GLIBCXX_3.4
@@ -1245,6 +1247,7 @@ FUNC:tanhl@@GLIBCXX_3.4
 FUNC:tanl@@GLIBCXX_3.4
 OBJECT:0:CXXABI_1.3
 OBJECT:0:GLIBCXX_3.4
+OBJECT:0:GLIBCXX_3.4.1
 OBJECT:12:_ZTIN10__cxxabiv116__enum_type_infoE@@CXXABI_1.3
 OBJECT:12:_ZTIN10__cxxabiv117__array_type_infoE@@CXXABI_1.3
 OBJECT:12:_ZTIN10__cxxabiv117__class_type_infoE@@CXXABI_1.3
diff --git a/lang/gcc34/files/baseline_symbols64.txt b/lang/gcc34/files/baseline_symbols64.txt
index efea379f55a..80acd4aed4e 100644
--- a/lang/gcc34/files/baseline_symbols64.txt
+++ b/lang/gcc34/files/baseline_symbols64.txt
@@ -602,6 +602,7 @@ FUNC:_ZNSt11range_errorC2ERKSs@@GLIBCXX_3.4
 FUNC:_ZNSt11range_errorD0Ev@@GLIBCXX_3.4
 FUNC:_ZNSt11range_errorD1Ev@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE2fdEv@@GLIBCXX_3.4
+FUNC:_ZNSt12__basic_fileIcE4fileEv@@GLIBCXX_3.4.1
 FUNC:_ZNSt12__basic_fileIcE4openEPKcSt13_Ios_Openmodei@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE4syncEv@@GLIBCXX_3.4
 FUNC:_ZNSt12__basic_fileIcE5closeEv@@GLIBCXX_3.4
@@ -1245,6 +1246,7 @@ FUNC:tanhl@@GLIBCXX_3.4
 FUNC:tanl@@GLIBCXX_3.4
 OBJECT:0:CXXABI_1.3
 OBJECT:0:GLIBCXX_3.4
+OBJECT:0:GLIBCXX_3.4.1
 OBJECT:104:_ZTVSt10moneypunctIcLb0EE@@GLIBCXX_3.4
 OBJECT:104:_ZTVSt10moneypunctIcLb1EE@@GLIBCXX_3.4
 OBJECT:104:_ZTVSt17moneypunct_bynameIcLb0EE@@GLIBCXX_3.4