Make this package work with Solaris:

- It can be bootstraped with Sun Workshop.
- It goes to "${LOCALBASE}" directly because there is no possible conflict
  with the system's GNU C compiler.

3 files changed, 344 insertions, 6 deletions

diff --git a/lang/gcc/Makefile b/lang/gcc/Makefile
index 0e836c5359b..e4d9a9225e6 100644
--- a/lang/gcc/Makefile
+++ b/lang/gcc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/09/25 22:19:19 fredb Exp $
+# $NetBSD: Makefile,v 1.9 2001/01/11 06:53:10 tron Exp $
 
 DISTNAME=		gcc-2.95.2
 CATEGORIES=		lang
@@ -11,7 +11,8 @@ BUILD_DEPENDS+=		${LOCALBASE}/bin/bison:../../devel/bison
 
 # NetBSD-arm32, NetBSD-i386 and NetBSD-m68k are the only tested platforms
 # so far. If you got it working on other platforms please add them.
-ONLY_FOR_PLATFORM=	NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k
+ONLY_FOR_PLATFORM=	NetBSD-*-arm32 NetBSD-*-i386 NetBSD-*-m68k \
+			SunOS-*-*
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -24,34 +25,54 @@ MACHINE_GCC_PLATFORM=	${MACHINE_GNU_PLATFORM}
 USE_GMAKE=		YES
 HAS_CONFIGURE=		YES
 CONFIGURE_ARGS=		--host=${MACHINE_GCC_PLATFORM} \
-			--prefix=${LOCALBASE}/${PKGNAME} \
-			--with-gnu-as --with-gnu-ld
+			--prefix=${GCC_PREFIX}
 CONFIGURE_SCRIPT=	${SRCDIR}/configure
 
 GCC_VERSION=		${PKGNAME:C/.*-//}
-MESSAGE_FILE=		${WRKDIR}/MESSAGE
 PLIST_SUBST+=		GCC_VERSION=${GCC_VERSION} \
 			MACHINE_GCC_PLATFORM=${MACHINE_GCC_PLATFORM}
 SRCDIR=			${WRKDIR}/${PKGNAME}
 WRKSRC=			${WRKDIR}/objdir
 
+.include "../../mk/bsd.prefs.mk"
+
+.if (${OPSYS} != SunOS)
+CONFIGURE_ARGS+=	--with-gnu-as --with-gnu-ld
+GCC_PREFIX=		${LOCALBASE}/${PKGNAME}
+MESSAGE_FILE=		${WRKDIR}/MESSAGE
+.else
+.if (${CC} != gcc)
+ALL_TARGET=		bootstrap
+.endif
+GCC_PREFIX=		${LOCALBASE}
+PLIST_SRC=		${PKGDIR}/PLIST.SunOS
+MESSAGE_FILE=		${PKGDIR}/MESSAGE.SunOS
+.endif
+
 post-extract:
 	${MKDIR} ${WRKSRC}
 
 post-patch:
 	${ECHO} "bogus" >${WRKSRC}/../${DISTNAME}/gcc/cstamp-h.in
 
+.if (${OPSYS} != SunOS)
 post-build:
 	for FILE in ${FILESDIR}/gcc.mk ${PKGDIR}/MESSAGE; do \
 	  ${SED} -e 's#@@MAKE@@#${MAKE}#g' \
 		 -e 's#@@PKGNAME@@#${PKGNAME}#g' \
 		 -e 's#@@PREFIX@@#${PREFIX}#g' \
-	   <$$FILE >${WRKDIR}/$${FILE##*/}; \
+	   <$$FILE >${WRKDIR}/`basename $$FILE`; \
 	done
+.endif
 
 post-install:
 	${RM} -f ${PREFIX}/${PKGNAME}/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/curses.h ${PREFIX}/${PKGNAME}/bin/cc
+.if (${OPSYS} != SunOS)
 	${LN} -s gcc ${PREFIX}/${PKGNAME}/bin/cc
 	${INSTALL_DATA} ${WRKDIR}/gcc.mk ${PREFIX}/etc/${PKGNAME}.mk
+.endif
 
 .include "../../mk/bsd.pkg.mk"
+
+# Make bootstrap with compiler != gcc possible.
+LDFLAGS=		${STRIPFLAG}
diff --git a/lang/gcc/pkg/MESSAGE.SunOS b/lang/gcc/pkg/MESSAGE.SunOS
new file mode 100644
index 00000000000..52df517a2ed
--- /dev/null
+++ b/lang/gcc/pkg/MESSAGE.SunOS
@@ -0,0 +1,2 @@
+To avoid conflicts with e.g. Sun WorkShop the GNU C compiler can only be
+invoked as "gcc" but not as "cc".
diff --git a/lang/gcc/pkg/PLIST.SunOS b/lang/gcc/pkg/PLIST.SunOS
new file mode 100644
index 00000000000..139ba75ca3f
--- /dev/null
+++ b/lang/gcc/pkg/PLIST.SunOS
@@ -0,0 +1,315 @@
+@comment $NetBSD: PLIST.SunOS,v 1.1 2001/01/11 06:53:11 tron Exp $
+${MACHINE_GCC_PLATFORM}/include/_G_config.h
+${MACHINE_GCC_PLATFORM}/include/assert.h
+bin/${MACHINE_GCC_PLATFORM}-gcc
+bin/c++
+bin/c++filt
+bin/chill
+bin/cpp
+bin/g++
+bin/g77
+bin/gcc
+bin/gcj
+bin/gcjh
+bin/gcov
+bin/jcf-dump
+bin/jv-scan
+bin/protoize
+bin/unprotoize
+include/g++-3/PlotFile.h
+include/g++-3/SFile.h
+include/g++-3/algo.h
+include/g++-3/algobase.h
+include/g++-3/algorithm
+include/g++-3/alloc.h
+include/g++-3/bitset
+include/g++-3/builtinbuf.h
+include/g++-3/bvector.h
+include/g++-3/cassert
+include/g++-3/cctype
+include/g++-3/cerrno
+include/g++-3/cfloat
+include/g++-3/ciso646
+include/g++-3/climits
+include/g++-3/clocale
+include/g++-3/cmath
+include/g++-3/complex
+include/g++-3/complex.h
+include/g++-3/csetjmp
+include/g++-3/csignal
+include/g++-3/cstdarg
+include/g++-3/cstddef
+include/g++-3/cstdio
+include/g++-3/cstdlib
+include/g++-3/cstring
+include/g++-3/ctime
+include/g++-3/cwchar
+include/g++-3/cwctype
+include/g++-3/defalloc.h
+include/g++-3/deque
+include/g++-3/deque.h
+include/g++-3/editbuf.h
+include/g++-3/floatio.h
+include/g++-3/fstream
+include/g++-3/fstream.h
+include/g++-3/function.h
+include/g++-3/functional
+include/g++-3/hash_map
+include/g++-3/hash_map.h
+include/g++-3/hash_set
+include/g++-3/hash_set.h
+include/g++-3/hashtable.h
+include/g++-3/heap.h
+include/g++-3/indstream.h
+include/g++-3/iolibio.h
+include/g++-3/iomanip
+include/g++-3/iomanip.h
+include/g++-3/iosfwd
+include/g++-3/iostdio.h
+include/g++-3/iostream
+include/g++-3/iostream.h
+include/g++-3/iostreamP.h
+include/g++-3/istream.h
+include/g++-3/iterator
+include/g++-3/iterator.h
+include/g++-3/libio.h
+include/g++-3/libioP.h
+include/g++-3/list
+include/g++-3/list.h
+include/g++-3/map
+include/g++-3/map.h
+include/g++-3/memory
+include/g++-3/multimap.h
+include/g++-3/multiset.h
+include/g++-3/numeric
+include/g++-3/ostream.h
+include/g++-3/pair.h
+include/g++-3/parsestream.h
+include/g++-3/pfstream.h
+include/g++-3/procbuf.h
+include/g++-3/pthread_alloc
+include/g++-3/pthread_alloc.h
+include/g++-3/queue
+include/g++-3/rope
+include/g++-3/rope.h
+include/g++-3/ropeimpl.h
+include/g++-3/set
+include/g++-3/set.h
+include/g++-3/slist
+include/g++-3/slist.h
+include/g++-3/stack
+include/g++-3/stack.h
+include/g++-3/std/bastring.cc
+include/g++-3/std/bastring.h
+include/g++-3/std/complext.cc
+include/g++-3/std/complext.h
+include/g++-3/std/dcomplex.h
+include/g++-3/std/fcomplex.h
+include/g++-3/std/gslice.h
+include/g++-3/std/gslice_array.h
+include/g++-3/std/indirect_array.h
+include/g++-3/std/ldcomplex.h
+include/g++-3/std/mask_array.h
+include/g++-3/std/slice.h
+include/g++-3/std/slice_array.h
+include/g++-3/std/std_valarray.h
+include/g++-3/std/straits.h
+include/g++-3/std/valarray_array.h
+include/g++-3/std/valarray_array.tcc
+include/g++-3/std/valarray_meta.h
+include/g++-3/stdexcept
+include/g++-3/stdiostream.h
+include/g++-3/stl.h
+include/g++-3/stl_algo.h
+include/g++-3/stl_algobase.h
+include/g++-3/stl_alloc.h
+include/g++-3/stl_bvector.h
+include/g++-3/stl_config.h
+include/g++-3/stl_construct.h
+include/g++-3/stl_deque.h
+include/g++-3/stl_function.h
+include/g++-3/stl_hash_fun.h
+include/g++-3/stl_hash_map.h
+include/g++-3/stl_hash_set.h
+include/g++-3/stl_hashtable.h
+include/g++-3/stl_heap.h
+include/g++-3/stl_iterator.h
+include/g++-3/stl_list.h
+include/g++-3/stl_map.h
+include/g++-3/stl_multimap.h
+include/g++-3/stl_multiset.h
+include/g++-3/stl_numeric.h
+include/g++-3/stl_pair.h
+include/g++-3/stl_queue.h
+include/g++-3/stl_raw_storage_iter.h
+include/g++-3/stl_relops.h
+include/g++-3/stl_rope.h
+include/g++-3/stl_set.h
+include/g++-3/stl_slist.h
+include/g++-3/stl_stack.h
+include/g++-3/stl_tempbuf.h
+include/g++-3/stl_tree.h
+include/g++-3/stl_uninitialized.h
+include/g++-3/stl_vector.h
+include/g++-3/stream.h
+include/g++-3/streambuf.h
+include/g++-3/strfile.h
+include/g++-3/string
+include/g++-3/strstream
+include/g++-3/strstream.h
+include/g++-3/tempbuf.h
+include/g++-3/tree.h
+include/g++-3/type_traits.h
+include/g++-3/utility
+include/g++-3/valarray
+include/g++-3/vector
+include/g++-3/vector.h
+info/chill.info
+info/cpp.info
+info/cpp.info-1
+info/cpp.info-2
+info/cpp.info-3
+info/g77.info
+info/g77.info-1
+info/g77.info-10
+info/g77.info-11
+info/g77.info-12
+info/g77.info-13
+info/g77.info-14
+info/g77.info-15
+info/g77.info-16
+info/g77.info-17
+info/g77.info-18
+info/g77.info-19
+info/g77.info-2
+info/g77.info-20
+info/g77.info-21
+info/g77.info-3
+info/g77.info-4
+info/g77.info-5
+info/g77.info-6
+info/g77.info-7
+info/g77.info-8
+info/g77.info-9
+info/gcc.info
+info/gcc.info-1
+info/gcc.info-10
+info/gcc.info-11
+info/gcc.info-12
+info/gcc.info-13
+info/gcc.info-14
+info/gcc.info-15
+info/gcc.info-16
+info/gcc.info-17
+info/gcc.info-18
+info/gcc.info-19
+info/gcc.info-2
+info/gcc.info-20
+info/gcc.info-21
+info/gcc.info-22
+info/gcc.info-23
+info/gcc.info-24
+info/gcc.info-25
+info/gcc.info-26
+info/gcc.info-27
+info/gcc.info-28
+info/gcc.info-29
+info/gcc.info-3
+info/gcc.info-30
+info/gcc.info-4
+info/gcc.info-5
+info/gcc.info-6
+info/gcc.info-7
+info/gcc.info-8
+info/gcc.info-9
+@exec mkdir -p %D/lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/v7
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/SYSCALLS.c.X
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1chill
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1obj
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cc1plus
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/chillrt0.o
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/collect2
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/cpp
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crt1.o
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtbegin.o
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtend.o
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crti.o
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/crtn.o
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/f771
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/gcrt1.o
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/gmon.o
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/README
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/assert.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/curses.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/exception
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/fixed
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/g2c.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/iso646.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/limits.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/math.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/new
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/new.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/NXConstStr.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/Object.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/Protocol.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/encoding.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/hash.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc-api.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc-list.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/objc.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/sarray.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/thr.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc/typedstream.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/proto.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stdarg.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stdbool.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/stddef.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/sys/stream.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/syslimits.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/typeinfo
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-alpha.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-arc.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-c4x.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-clipper.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-h8300.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-i860.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-i960.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-m32r.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-m88k.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mips.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mn10200.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-mn10300.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-pa.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-ppc.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-pyr.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-sh.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-sparc.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-spur.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/va-v850.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/varargs.h
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/jc1
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/jvgenmain
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libchill.a
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libg2c.a
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libgcc.a
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libobjc.a
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/libstdc++.a
+lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/specs
+lib/libiberty.a
+lib/libstdc++.a.2.10.0
+man/man1/cccp.1
+man/man1/g++.1
+man/man1/g77.1
+man/man1/gcc.1
+@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/v7
+@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/sys
+@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include/objc
+@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}/include
+@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}/${GCC_VERSION}
+@dirrm lib/gcc-lib/${MACHINE_GCC_PLATFORM}
+@dirrm lib/gcc-lib
+@dirrm include/g++-3/std
+@dirrm include/g++-3
+@dirrm ${MACHINE_GCC_PLATFORM}/include
+@dirrm ${MACHINE_GCC_PLATFORM}