Add --enable-shared to the configuration phase so that a shared libstdc++

gets built.

Add makefile fragments to do the right thing for elf and a.out. Make sure
they are used.

Add @exec/@unexec install-info to the PLIST.

Fixes pkg/12154 from Olaf Seibert <rhialto@polderland.nl>

7 files changed, 53 insertions, 7 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 15b3315e2fb..881fd7c9225 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2001/04/30 19:02:27 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2001/05/04 10:15:44 skrll Exp $
 
 DISTNAME=		gcc-2.95.2
 CATEGORIES=		lang
@@ -26,7 +26,8 @@ MACHINE_GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}
 USE_GMAKE=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS=		--host=${MACHINE_GCC_PLATFORM} \
-			--prefix=${GCC_PREFIX}
+			--prefix=${GCC_PREFIX} \
+			--enable-shared
 CONFIGURE_SCRIPT=	${SRCDIR}/configure
 
 GCC_VERSION=		${PKGNAME:C/.*-//}
@@ -57,6 +58,7 @@ CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
 
 post-extract:
 	${MKDIR} ${WRKSRC}
+	${CP} ${FILESDIR}/netbsd*.ml ${WRKSRC}/../${DISTNAME}/libstdc++/config
 
 post-patch:
 	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in
diff --git a/lang/gcc/distinfo b/lang/gcc/distinfo
index 763f089173b..c894d2c73cc 100644
--- a/lang/gcc/distinfo
+++ b/lang/gcc/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2001/04/27 10:45:22 skrll Exp $
+$NetBSD: distinfo,v 1.4 2001/05/04 10:15:45 skrll Exp $
 
 SHA1 (gcc-2.95.2.tar.gz) = c3da103de3fa97c78ccc1b4fdc29fa25bf26a6c8
 Size (gcc-2.95.2.tar.gz) = 12885815 bytes
@@ -27,3 +27,4 @@ SHA1 (patch-av) = fac14cc43a451671ee825961c24870426991f4c7
 SHA1 (patch-aw) = 6a793c8735e167dbcab1c33248438a6ac8057717
 SHA1 (patch-ax) = 242d5219ba8b0debe038e186deecc980f9bf9a3f
 SHA1 (patch-ay) = eaaf536efdee990fa6970b1281fed4c6f2621c26
+SHA1 (patch-az) = 67d507f29492b3bc7a11551a1344aff3b8bb56fe
diff --git a/lang/gcc/files/netbsd.ml b/lang/gcc/files/netbsd.ml
new file mode 100644
index 00000000000..5ff8e1c7511
--- /dev/null
+++ b/lang/gcc/files/netbsd.ml
@@ -0,0 +1,8 @@
+# a.out with shared libm, so we can link it into the shared libstdc++.
+
+ARLIB   = libstdc++.a.`echo $(VERSION) | sed 's/\([0-9]*[.][0-9]*\).*/\1/'`
+SHLIB   = libstdc++.so.`echo $(VERSION) | sed 's/\([0-9]*[.][0-9]*\).*/\1/'`
+
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB)
+SHDEPS  = -lm
+DEPLIBS = ../$(SHLIB)
diff --git a/lang/gcc/files/netbsdelf.ml b/lang/gcc/files/netbsdelf.ml
new file mode 100644
index 00000000000..9fab25c3bae
--- /dev/null
+++ b/lang/gcc/files/netbsdelf.ml
@@ -0,0 +1,10 @@
+# Elf with shared libm, so we can link it into the shared libstdc++.
+
+ARLIB   = libstdc++.a.`echo $(VERSION) | sed 's/\([0-9]*[.][0-9]*\).*/\1/'`
+SHLIB   = libstdc++.so.`echo $(VERSION) | sed 's/\([0-9]*[.][0-9]*\).*/\1/'`
+MSHLINK = libstdc++.so.`echo $(VERSION) | sed 's/\([0-9]*\).*/\1/'`
+
+LIBS    = $(ARLIB) $(ARLINK) $(SHLIB) $(SHLINK) mshlink
+SHFLAGS = -Wl,-soname,$(MSHLINK)
+SHDEPS  = -lm
+DEPLIBS = ../$(SHLIB)
diff --git a/lang/gcc/patches/patch-az b/lang/gcc/patches/patch-az
new file mode 100644
index 00000000000..387c55f6011
--- /dev/null
+++ b/lang/gcc/patches/patch-az
@@ -0,0 +1,13 @@
+$NetBSD: patch-az,v 1.1 2001/05/04 10:15:46 skrll Exp $
+
+--- ../gcc-2.95.2/libstdc++/configure.in.orig	Tue Jun  8 00:28:10 1999
++++ ../gcc-2.95.2/libstdc++/configure.in
+@@ -73,6 +73,8 @@
+     *-*-linux*aout*)	;;
+     *-*-freebsd2*)	;;
+     *-*-freebsd*)	frags="${frags} freebsd.ml" ;;
++    *-*-netbsdelf*)	frags="${frags} netbsdelf.ml" ;;
++    *-*-netbsd*)        frags="${frags} netbsd.ml" ;;
+     *-*-linux*)		frags="${frags} linux.ml" ;;
+     *-*-openbsd*)		frags="${frags} openbsd.ml" ;;
+     *-*-sysv[45]*|*-*-udk*)	frags="${frags} elf.ml" ;;
diff --git a/lang/gcc/pkg/PLIST b/lang/gcc/pkg/PLIST
index a62a46be094..a911ed987ac 100644
--- a/lang/gcc/pkg/PLIST
+++ b/lang/gcc/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2001/05/04 09:19:21 skrll Exp $
+@comment $NetBSD: PLIST,v 1.5 2001/05/04 10:15:46 skrll Exp $
 ${PKGNAME}/${MACHINE_GCC_PLATFORM}/include/_G_config.h
 ${PKGNAME}/bin/${MACHINE_GCC_PLATFORM}-gcc
 ${PKGNAME}/bin/c++
@@ -164,11 +164,16 @@ ${PKGNAME}/include/g++-3/utility
 ${PKGNAME}/include/g++-3/valarray
 ${PKGNAME}/include/g++-3/vector
 ${PKGNAME}/include/g++-3/vector.h
+@unexec install-info --delete --info-dir=%D/info %D/${PKGNAME}/info/chill.info
 ${PKGNAME}/info/chill.info
+@exec install-info --info-dir=%D/info %D/${PKGNAME}/info/chill.info
+@unexec install-info --delete --info-dir=%D/info %D/${PKGNAME}/info/cpp.info
 ${PKGNAME}/info/cpp.info
 ${PKGNAME}/info/cpp.info-1
 ${PKGNAME}/info/cpp.info-2
 ${PKGNAME}/info/cpp.info-3
+@exec install-info --info-dir=%D/info %D/${PKGNAME}/info/cpp.info
+@unexec install-info --delete --info-dir=%D/info %D/${PKGNAME}/info/g77.info
 ${PKGNAME}/info/g77.info
 ${PKGNAME}/info/g77.info-1
 ${PKGNAME}/info/g77.info-10
@@ -191,6 +196,8 @@ ${PKGNAME}/info/g77.info-6
 ${PKGNAME}/info/g77.info-7
 ${PKGNAME}/info/g77.info-8
 ${PKGNAME}/info/g77.info-9
+@exec install-info --info-dir=%D/info %D/${PKGNAME}/info/g77.info
+@unexec install-info --delete --info-dir=%D/info %D/${PKGNAME}/info/gcc.info
 ${PKGNAME}/info/gcc.info
 ${PKGNAME}/info/gcc.info-1
 ${PKGNAME}/info/gcc.info-10
@@ -222,6 +229,7 @@ ${PKGNAME}/info/gcc.info-6
 ${PKGNAME}/info/gcc.info-7
 ${PKGNAME}/info/gcc.info-8
 ${PKGNAME}/info/gcc.info-9
+@exec install-info --info-dir=%D/info %D/${PKGNAME}/info/gcc.info
 ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/SYSCALLS.c.X
 ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1
 ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1chill
@@ -286,7 +294,9 @@ ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libobjc.a
 ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libstdc++.a
 ${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/specs
 ${PKGNAME}/lib/libiberty.a
-${PKGNAME}/lib/libstdc++.a.2.10.0
+${PKGNAME}/lib/libstdc++.a.2.10
+${PKGNAME}/lib/libstdc++.so.2
+${PKGNAME}/lib/libstdc++.so.2.10
 ${PKGNAME}/man/man1/cccp.1
 ${PKGNAME}/man/man1/g++.1
 ${PKGNAME}/man/man1/g77.1
diff --git a/lang/pgcc/Makefile b/lang/pgcc/Makefile
index 011ecdfa1f7..6e2cf1e6b92 100644
--- a/lang/pgcc/Makefile
+++ b/lang/pgcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2001/04/30 21:07:02 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2001/05/04 10:15:46 skrll Exp $
 
 DISTNAME=		gcc-2.95.2
 PKGNAME=		pgcc-2.95.2.1
@@ -37,7 +37,8 @@ MACHINE_GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}
 USE_GMAKE=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS=		--host=${MACHINE_GCC_PLATFORM} \
-			--prefix=${GCC_PREFIX}
+			--prefix=${GCC_PREFIX} \
+			--enable-shared
 CONFIGURE_SCRIPT=	${SRCDIR}/configure
 
 # For pgcc, GCC_VERSION is actually the name of a subdirectory in the gcc
@@ -73,6 +74,7 @@ CONFLICTS+=		gcc-[0-9]* pgcc-[0-9]*
 
 post-extract:
 	${MKDIR} ${WRKSRC}
+	${CP} ${FILESDIR}/netbsd*.ml ${WRKSRC}/../${DISTNAME}/libstdc++/config
 
 post-patch:
 	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in