[csw-devel] SF.net SVN: gar:[15486] csw/mgar/pkg/gcc4/branches/bootstrap-3.4

wahwah at users.sourceforge.net wahwah at users.sourceforge.net
Thu Sep 1 12:41:42 CEST 2011


Revision: 15486
          http://gar.svn.sourceforge.net/gar/?rev=15486&view=rev
Author:   wahwah
Date:     2011-09-01 10:41:42 +0000 (Thu, 01 Sep 2011)
Log Message:
-----------
pkg/gcc4/branches/bootstrap-3.4: it builds! (but packages need more work)

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-3.4/Makefile
    csw/mgar/pkg/gcc4/branches/bootstrap-3.4/checksums
    csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/package_def.mk

Added Paths:
-----------
    csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/0001-GNU-assembler-version-discovery.patch
    csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/scripts.mk

Property Changed:
----------------
    csw/mgar/pkg/gcc4/branches/bootstrap-3.4/


Property changes on: csw/mgar/pkg/gcc4/branches/bootstrap-3.4
___________________________________________________________________
Added: svn:mergeinfo
   + /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15346-15435
/csw/mgar/pkg/gcc4/branches/opt-csw-prefix:15436-15453

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-3.4/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-3.4/Makefile	2011-09-01 09:19:39 UTC (rev 15485)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-3.4/Makefile	2011-09-01 10:41:42 UTC (rev 15486)
@@ -1,9 +1,18 @@
 # $Id$
+#
+# ! Ada is not built yet, it requires PPL which isn't built yet.
+#
+# amd64 compilation fails
+# potentially related bug:
+# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39048
 
 NAME      = gcc
-VERSION   = 4.6.1
+VERSION   = 3.4.6
 CATEGORIES   = lang
 GARTYPE = v2
+BASE_VERSION = $(shell echo $(VERSION) | gsed -e 's/^\([0-9]\+\.[0-9]\+\)\(.*\)/\1/')
+# PKG_BASENAME = CSWgcc-$(subst .,-,$(BASE_VERION))
+PKG_BASENAME = CSWgcc3
 
 DESCRIPTION  = The GNU Compiler Collection
 define BLURB
@@ -21,9 +30,27 @@
 # GIT init takes a long time, disable for now, reenable if build works
 # NOGITPATCH ?= 1
 
+## Source URLs
+VENDOR_URL = http://gcc.gnu.org
+
+## Copyright File
+LICENSE = COPYING
+
+# prefix = $(BUILD_PREFIX)/gcc4
+# libdir_install = $(BUILD_PREFIX)/lib
+# libdir = $(abspath $(BUILD_PREFIX)/lib/$(MM_LIBDIR))
+# CONFIGURE_ARGS += --prefix=$(prefix)
+# CONFIGURE_ARGS += --libdir=$(libdir)
+# CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
+
 ## build options
-CONFIGURE_ARGS  = --prefix=$(BUILD_PREFIX)/gcc4
-CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
+# http://gcc.gnu.org/install/configure.html
+
+# Could be used to break out of the /opt/csw/gcc4 prefix
+PROGRAM_SUFFIX = -$(BASE_VERSION)
+CONFIGURE_ARGS += --program-suffix=$(PROGRAM_SUFFIX)
+
+CONFIGURE_ARGS += $(DIRPATHS)
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
 CONFIGURE_ARGS += --without-gnu-ld
@@ -34,27 +61,67 @@
 CONFIGURE_ARGS += --with-x
 CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
+# To be enabled when PPL is built
+# CONFIGURE_ARGS += --with-ppl=$(BUILD_PREFIX)
 CONFIGURE_ARGS += --enable-java-awt=xlib
 # CONFIGURE_ARGS += --enable-libada
 CONFIGURE_ARGS += --enable-libssp
-CONFIGURE_ARGS += --enable-objc-gc
+# Compilation fails with gc.h not found
+# http://gcc.gnu.org/ml/gcc-bugs/2002-02/msg00070.html
+# CONFIGURE_ARGS += --enable-objc-gc
 CONFIGURE_ARGS += --enable-threads=posix 
 CONFIGURE_ARGS += --enable-stage1-languages=c
-# We'll build ada later.
+# We'll build ada later. It requires the PPL library.
 # CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc
-CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc
+CONFIGURE_ARGS += --enable-languages=c,c++,f77,java,objc
 CONFIGURE_ARGS += --enable-bootstrap
+CONFIGURE_ARGS += --with-system-zlib
 
+# there could be some abstractions in gar.conf.mk, but at the moment there
+# aren't so let's specify architectures by hand.
+#
+# This avoids the sparcv8+ binaries.
+CPU_sparc_32 = v8
+CPU_sparc_64 = v9
+CPU_i386_32 = i386
+CPU_i386_64 = x86-64
+
+CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32)
+# These two should not be defined, otherwise the Intel build breaks.
+# CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
+# CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64)
+CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
+
 # GCC can't be built in the same directory with the sources.
-OBJDIR          = objdir
+# It also can't be built in a subdirectory of the sources.
+OBJDIR          = $(abspath $(WORKDIR)/objdir)
 
 # These flags are passed when gcc is built with gcc.
 # Needed to remove FLAVOR_FLAGS, because they were Sun Studio specific.
-CFLAGS_FOR_TARGET = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
-CXXFLAGS_FOR_TARGET = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+CFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CC_FLAGS) $(EXTRA_GCC_CC_FLAGS) $(EXTRA_CC_FLAGS)
+CXXFLAGS_FOR_TARGET_sparc = -O2 $(ARCHFLAGS_GCC4_$(ISA)) $(EXTRA_GCC4_CXX_FLAGS) $(EXTRA_GCC_CXX_FLAGS) $(EXTRA_CXX_FLAGS)
+CFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET_$(GARCH))
+CXXFLAGS_FOR_TARGET = $(CXXFLAGS_FOR_TARGET_$(GARCH))
 EXTRA_EXPORTS += CFLAGS_FOR_TARGET
 EXTRA_EXPORTS += CXXFLAGS_FOR_TARGET
 
+# The theory goes that the CFLAGS and others cause problems with the multilib
+# builds where 64-bit binaries are built.  This is triggered by the gcc build;
+# the compiler binaries are 32-bit only, but since the compiler can generate
+# 32-bit and 64-bit binaries, the libraries have to be built for both
+# architectures.
+ifeq ($(MODULATION),isa-i386)
+CFLAGS =
+CXXFLAGS =
+FFLAGS =
+FCFLAGS =
+OPTFLAGS =
+endif
+
+# Might be necessary, but CFLAGS_FOR_TARGET seem to be enough for now.
+# BOOT_CFLAGS = $(CFLAGS_FOR_TARGET)
+# EXTRA_EXPORTS += BOOT_FLAGS
+
 # bash must be used, otherwise:
 # http://fixunix.com/solaris/490396-gcc-build-fails-cannot-compute-suffix-object-files.html
 CONFIG_SHELL = /opt/csw/bin/bash
@@ -63,11 +130,323 @@
 EXTRA_CONFIGURE_EXPORTS += CFLAGS_FOR_TARGET
 EXTRA_CONFIGURE_EXPORTS += CXXFLAGS_FOR_TARGET
 
-# OBJDUMP=/opt/csw/bin/gobjdump
-# EXTRA_EXPORTS += OBJDUMP
+# Only required for Sun Studio bootstrapping
+# PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch
+PATCHFILES += 0001-GNU-assembler-version-discovery.patch
 
-PATCHFILES += 0001-clear-AM_CFLAGS-in-lto-plugin.patch
+# Bootstrapping with Sun Studio has issues
+# http://gcc.gnu.org/ml/gcc-help/2011-08/msg00191.html
+GARCOMPILER = GNU
 
+# There's a lot of failing checks. Probably a lot of porting work.
+SKIPTEST = 1
+
+PACKAGES = $(PKG_BASENAME)core
+SPKG_DESC_$(PKG_BASENAME)core = GNU C compiler
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlib-gnu-awt-xlib12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibffi4
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj-tools12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgcj12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgij12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgmp10
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibgomp1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpc2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibmpfr4
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibssp0
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibz1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWpython
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpc2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc3
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc3
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibz1
+RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibz1
+
+# Because I can.
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-with-bad-content
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += file-with-bad-content
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += file-with-bad-content
+CHECKPKG_OVERRIDES_CSWlibgcj12 += file-with-bad-content
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/i386-pc-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.9/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap|$(libexecdir)/gcc/sparc-sun-solaris2.10/$(VERSION)/liblto_plugin.la
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-with-bad-content
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += file-with-bad-content
+# Due to complex regular expressions
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|$(PKG_BASENAME)g++|$(PKG_BASENAME)java
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)g++ += file-collision|$(includedir)/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|$(PKG_BASENAME)g++|$(PKG_BASENAME)java
+
+# Only man pages, so not a big problem. Alternatives could be used, but it
+# requires rebuilding libffi.
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_call.3|$(PKG_BASENAME)core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi.3|$(PKG_BASENAME)core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(mandir)/man3/ffi_prep_cif.3|$(PKG_BASENAME)core|CSWlibffi-dev
+
+# The .a files are necessary
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += discouraged-path-in-pkgmap
+
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += discouraged-path-in-pkgmap
+
+# From the 'hopeless errors' department:
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libffi.so|CSWgcc3javart|$(PKG_BASENAME)core
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libgcc_s.so|CSWgcc3core|$(PKG_BASENAME)core
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libgcj.so|CSWgcc3javart|$(PKG_BASENAME)core
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)core
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/lib-gnu-awt-xlib.so|CSWgcc3javart|$(PKG_BASENAME)core
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libffi.so|CSWgcc3javart|$(PKG_BASENAME)core
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libgcj.so|CSWgcc3javart|$(PKG_BASENAME)core
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)core
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)objc
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += file-collision|$(libdir)/sparcv9/libobjc.so|CSWgcc3objcrt|$(PKG_BASENAME)objc
+CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += file-collision|$(libdir)/lib-gnu-awt-xlib.so|CSWgcc3javart|$(PKG_BASENAME)core
+
+# Some static libraries are required to build binaries with gcc, for example
+# libgcc.a and libgcc_eh.a. Otherwise: ld: fatal: library -lgcc: not found
+MERGE_EXCLUDE_LIBTOOL =
+MERGE_EXCLUDE_STATICLIBS =
+EXTRA_MERGE_EXCLUDE_FILES = $(libdir)/libiberty\.a
+
+# Catch-all package
+
+PACKAGES += CSWlib-gnu-awt-xlib12
+CATALOGNAME_CSWlib-gnu-awt-xlib12 = lib_gnu_awt_xlib12
+PKGFILES_CSWlib-gnu-awt-xlib12 += $(call baseisadirs,$(libdir),lib-gnu-awt-xlib\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlib-gnu-awt-xlib12 += The GNU Compiler Collection, lib-gnu-awt-xlib.so.12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlib-gnu-awt-xlib12
+RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib12 += CSWlibstdc++6
+RUNTIME_DEP_PKGS_CSWlib-gnu-awt-xlib12 += CSWlibgcc-s1
+
+PACKAGES += CSWlibffi4
+CATALOGNAME_CSWlibffi4 = libffi4
+PKGFILES_CSWlibffi4 += $(call baseisadirs,$(libdir),libffi\.so\.4(\.\d+)*)
+SPKG_DESC_CSWlibffi4 += The GNU Compiler Collection, libffi.so.4
+RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibffi4
+RUNTIME_DEP_PKGS_CSWlibffi4 += CSWlibgcc-s1
+
+PACKAGES += CSWlibgcc-s1
+CATALOGNAME_CSWlibgcc-s1 = libgcc_s1
+PKGFILES_CSWlibgcc-s1 += $(call baseisadirs,$(libdir),libgcc_s\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibgcc-s1 += The GNU Compiler Collection, libgcc_s.so.1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibgcc-s1
+# For reference, the old CSWgcc3corert:
+# http://buildfarm.opencsw.org/pkgdb/srv4/1991387f2cb9f545b2a1b254b50638ef/
+OBSOLETED_BY_CSWlibgcc-s1 = CSWgcc3corert
+
+PACKAGES += CSWlibgcj-tools12
+CATALOGNAME_CSWlibgcj-tools12 = libgcj_tools12
+PKGFILES_CSWlibgcj-tools12 += $(call baseisadirs,$(libdir),libgcj-tools\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlibgcj-tools12 += The GNU Compiler Collection, libgcj-tools.so.12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibgcj-tools12
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcj12
+RUNTIME_DEP_PKGS_CSWlibgcj-tools12 += CSWlibgcc-s1
+
+PACKAGES += CSWlibgcj12
+CATALOGNAME_CSWlibgcj12 = libgcj12
+PKGFILES_CSWlibgcj12 += $(call baseisadirs,$(libdir),libgcj\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlibgcj12 += The GNU Compiler Collection, libgcj.so.12
+RUNTIME_DEP_PKGS_CSWlibgcj12 += CSWlibgcc-s1
+
+PACKAGES += CSWlibgfortran3
+CATALOGNAME_CSWlibgfortran3 = libgfortran3
+PKGFILES_CSWlibgfortran3 += $(call baseisadirs,$(libdir),libgfortran\.so\.3(\.\d+)*)
+SPKG_DESC_CSWlibgfortran3 += The GNU Compiler Collection, libgfortran.so.3
+RUNTIME_DEP_PKGS_$(PKG_BASENAME) += CSWlibgfortran3
+RUNTIME_DEP_PKGS_CSWlibgfortran3 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibgfortran3 = $(PKG_BASENAME)gfortranrt
+
+PACKAGES += CSWlibgij12
+CATALOGNAME_CSWlibgij12 = libgij12
+PKGFILES_CSWlibgij12 += $(call baseisadirs,$(libdir),libgij\.so\.12(\.\d+)*)
+SPKG_DESC_CSWlibgij12 += The GNU Compiler Collection, libgij.so.12
+
+PACKAGES += CSWlibgomp1
+CATALOGNAME_CSWlibgomp1 = libgomp1
+PKGFILES_CSWlibgomp1 += $(call baseisadirs,$(libdir),libgomp\.so\.1(\.\d+)*)
+SPKG_DESC_CSWlibgomp1 += The GNU Compiler Collection, libgomp.so.1
+RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibgomp1 += $(PKG_BASENAME)corert
+
+PACKAGES += CSWlibobjc3
+CATALOGNAME_CSWlibobjc3 = libobjc3
+PKGFILES_CSWlibobjc3 += $(call baseisadirs,$(libdir),libobjc\.so\.3(\.\d+)*)
+SPKG_DESC_CSWlibobjc3 += The GNU Compiler Collection, libobjc.so.3
+RUNTIME_DEP_PKGS_CSWlibobjc3 += CSWlibgcc-s1
+
+PACKAGES += CSWlibobjc-gc3
+CATALOGNAME_CSWlibobjc-gc3 = libobjc_gc3
+PKGFILES_CSWlibobjc-gc3 += $(call baseisadirs,$(libdir),libobjc_gc\.so\.3(\.\d+)*)
+SPKG_DESC_CSWlibobjc-gc3 += The GNU Compiler Collection, libobjc_gc.so.3
+RUNTIME_DEP_PKGS_CSWlibobjc-gc3 += CSWlibgcc-s1
+
+PACKAGES += CSWlibssp0
+CATALOGNAME_CSWlibssp0 = libssp0
+PKGFILES_CSWlibssp0 += $(call baseisadirs,$(libdir),libssp\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibssp0 += The GNU Compiler Collection, libssp.so.0
+RUNTIME_DEP_PKGS_CSWlibssp0 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibssp0 += $(PKG_BASENAME)corert
+
+PACKAGES += CSWlibstdc++6
+CATALOGNAME_CSWlibstdc++6 = libstdc++6
+PKGFILES_CSWlibstdc++6 += $(call baseisadirs,$(libdir),libstdc\+\+\.so\.6(\.\d+)*)
+SPKG_DESC_CSWlibstdc++6 += The GNU Compiler Collection, libstdc++.so.6
+RUNTIME_DEP_PKGS_CSWlibstdc++6 += CSWlibgcc-s1
+OBSOLETED_BY_CSWlibstdc++6 = $(PKG_BASENAME)g++rt
+
+# The libquadmath.so.0 library is only build on Intel
+PACKAGES_i386 += CSWlibquadmath0
+CATALOGNAME_CSWlibquadmath0 = libquadmath0
+PKGFILES_CSWlibquadmath0 += $(call baseisadirs,$(libdir),libquadmath\.so\.0(\.\d+)*)
+SPKG_DESC_CSWlibquadmath0 += GNU C compiler, libquadmath.so.0
+RUNTIME_DEP_PKGS_CSWlibquadmath0 += CSWlibgcc-s1
+
+# Dependencies only on Intel
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386 += CSWlibquadmath0
+RUNTIME_DEP_PKGS_CSWlibgfortran3_i386 += CSWlibquadmath0
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH))
+RUNTIME_DEP_PKGS_CSWlibgfortran3 += $(RUNTIME_DEP_PKGS_CSWlibgfortran3_$(GARCH))
+
+PACKAGES += $(PKG_BASENAME)g++
+SPKG_DESC_$(PKG_BASENAME)g++ = GNU C++ Compiler
+PKGFILES_$(PKG_BASENAME)g++  = $(bindir)/[cg]\+\+$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)g++ += $(bindir)/\w+-\w+-solaris[\d\.]+-[cg]\+\+$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)g++ += $(libexecdir)/.*cc1plus
+PKGFILES_$(PKG_BASENAME)g++ += $(libdir)/.*libstdc.*a
+PKGFILES_$(PKG_BASENAME)g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
+PKGFILES_$(PKG_BASENAME)g++ += $(mandir)/.*g\+\+.1
+# I do not understand this regular expression.
+PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
+PKGFILES_$(PKG_BASENAME)g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.*
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibgmp10
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpc2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibstdc++6
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibz1
+
+OBSOLETED_BY_CSWlibgcc-s1 += $(PKG_BASENAME)corert
+RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_CSWlibgij12 += CSWlibgcj12
+
+PACKAGES += $(PKG_BASENAME)gfortran
+SPKG_DESC_$(PKG_BASENAME)gfortran   = GNU Fortran Compiler
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgmp10
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibgfortran3
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1
+PKGFILES_$(PKG_BASENAME)gfortran  = $(bindir)/gfortran$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)gfortran += $(bindir)/\w+-\w+-solaris[\d\.]+-gfortran$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)gfortran += $(libdir)/.*libgfortran.*a
+PKGFILES_$(PKG_BASENAME)gfortran += $(libexecdir)/.*f951
+PKGFILES_$(PKG_BASENAME)gfortran += $(mandir)/.*gfortran.1
+PKGFILES_$(PKG_BASENAME)gfortran += $(infodir)/gfortran.*
+PKGFILES_$(PKG_BASENAME)gfortran += $(call baseisadirs,$(libdir),libgfortran\.so)
+OBSOLETED_BY_$(PKG_BASENAME)gfortran  = $(PKG_BASENAME)g95
+OBSOLETED_BY_$(PKG_BASENAME)gfortran += $(PKG_BASENAME)g95rt
+
+PACKAGES += $(PKG_BASENAME)java
+SPKG_DESC_$(PKG_BASENAME)java       = GNU Java Compiler
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgmp10
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcc-s1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj-tools12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgcj12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibgij12
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibz1
+
+PKGFILES_$(PKG_BASENAME)java  = $(bindir)/.*gcj.*$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*jv-scan$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*jv-convert$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*jcf-dump$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*grmi.*$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*grepjar$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gjnih$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gij$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*fastjar$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gjar.*$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gjavah$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gorbd$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*addr2name.awk$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gappletviewer$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gkeytool$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gserialver$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gtnameserv$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gnative2ascii$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(bindir)/.*gc-analyze$(PROGRAM_SUFFIX)
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gcj.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gij.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/jv.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/jcf.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/grmi.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*jar.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*jni.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*java.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gorbd.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gapplet.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gkeytool.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gserialver.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gtnameserv.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gnative2ascii.*
+PKGFILES_$(PKG_BASENAME)java += $(mandir)/.*/gc-analyze.*
+PKGFILES_$(PKG_BASENAME)java += $(datadir)/java/.*
+PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*libgij.*a
+PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*libffi.*a
+PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*lib-gnu-awt.*a
+PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*security.*
+PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*logging.properties
+PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*pkgconfig.*
+PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*gcj.*a
+PKGFILES_$(PKG_BASENAME)java += $(libdir)/.*libgcj.*a
+PKGFILES_$(PKG_BASENAME)java += $(libexecdir)/.*collect.*
+PKGFILES_$(PKG_BASENAME)java += $(libexecdir)/.*jvgenmain
+PKGFILES_$(PKG_BASENAME)java += $(libexecdir)/.*jc1.*
+PKGFILES_$(PKG_BASENAME)java += $(infodir)/gcj.*
+PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*gcj/.*
+PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*awt/.*
+PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*classpath/.*
+PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*java.*
+PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*ffi.h
+PKGFILES_$(PKG_BASENAME)java += $(includedir)/.*org/.*
+
+PACKAGES += $(PKG_BASENAME)objc
+SPKG_DESC_$(PKG_BASENAME)objc       = GNU Objective C Compiler
+PKGFILES_$(PKG_BASENAME)objc  = $(libexecdir)/.*cc1obj
+PKGFILES_$(PKG_BASENAME)objc += $(libdir)/.*libobjc.*a
+PKGFILES_$(PKG_BASENAME)objc += $(includedir)/.*objc/.*
+PKGFILES_$(PKG_BASENAME)objc += $(libdir)/.*/include/objc/.*
+PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc.so)
+PKGFILES_$(PKG_BASENAME)objc += $(call baseisadirs,$(libdir),libobjc_gc.so)
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibmpfr4
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibgmp10
+
+# libiconv deps cropped up relatively late in the porting process. Perhaps
+# they apply to all arch/OS combinations.
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibiconv2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibiconv2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibiconv2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibiconv2
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibiconv2
+
+# Maybe it's unnecessary.
+# # Solaris 10 on i386 specific:
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)java_i386_5.10 += CSWlibiconv2
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)core_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc_$(GARCH)_$(GAROSREL))
+# RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += $(RUNTIME_DEP_PKGS_$(PKG_BASENAME)java_$(GARCH)_$(GAROSREL))
+
+PACKAGES += $(PACKAGES_$(GARCH))
+
+include files/scripts.mk
 include gar/category.mk
 
 # We need GNU find as find

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-3.4/checksums
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-3.4/checksums	2011-09-01 09:19:39 UTC (rev 15485)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-3.4/checksums	2011-09-01 10:41:42 UTC (rev 15486)
@@ -1 +1 @@
-c57a9170c677bf795bdc04ed796ca491  gcc-4.6.1.tar.bz2
+4a21ac777d4b5617283ce488b808da7b  gcc-3.4.6.tar.bz2

Added: csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/0001-GNU-assembler-version-discovery.patch
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/0001-GNU-assembler-version-discovery.patch	                        (rev 0)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/0001-GNU-assembler-version-discovery.patch	2011-09-01 10:41:42 UTC (rev 15486)
@@ -0,0 +1,73 @@
+From e8140808e4f1741f961388908b6c358f4254ee2e Mon Sep 17 00:00:00 2001
+From: Maciej Blizinski <maciej at opencsw.org>
+Date: Thu, 1 Sep 2011 01:43:06 +0200
+Subject: [PATCH] GNU assembler version discovery
+
+---
+ gcc/configure |   28 +++++++++++++++-------------
+ 1 files changed, 15 insertions(+), 13 deletions(-)
+
+diff --git a/gcc/configure b/gcc/configure
+index 91f9326..39f7c54 100755
+--- a/gcc/configure
++++ b/gcc/configure
+@@ -10488,16 +10488,7 @@ else
+   fi
+ else
+   gcc_cv_ld_hidden=yes
+-  ld_ver=`$gcc_cv_ld --version 2>/dev/null | sed 1q`
+   if echo "$ld_ver" | grep GNU > /dev/null; then
+-    ld_vers=`echo $ld_ver | sed -n \
+-	-e 's,^.*[	 ]\([0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \
+-	-e 's,^.*[	 ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \
+-	-e 's,^.*[	 ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)$,\1,p' \
+-	-e 's,^.*[	 ]\([0-9][0-9]*\.[0-9][0-9]*\)[	 ].*$,\1,p' \
+-	-e 's,^.*[	 ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[	 ].*$,\1,p' \
+-	-e 's,^.*[	 ]\([0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\.[0-9][0-9]*\)[	 ].*$,\1,p'`
+-    ld_date=`echo $ld_ver | sed -n 's,^.*\([2-9][0-9][0-9][0-9]\)[-]*\([01][0-9]\)[-]*\([0-3][0-9]\).*$,\1\2\3,p'`
+     if test 0"$ld_date" -lt 20020404; then
+       if test -n "$ld_date"; then
+ 	# If there was date string, but was earlier than 2002-04-04, fail
+@@ -10506,9 +10497,6 @@ else
+ 	# If there was no date string nor ld version number, something is wrong
+ 	gcc_cv_ld_hidden=no
+       else
+-	ld_vers_major=`expr "$ld_vers" : '\([0-9]*\)'`
+-	ld_vers_minor=`expr "$ld_vers" : '[0-9]*\.\([0-9]*\)'`
+-	ld_vers_patch=`expr "$ld_vers" : '[0-9]*\.[0-9]*\.\([0-9]*\)'`
+ 	test -z "$ld_vers_patch" && ld_vers_patch=0
+ 	if test "$ld_vers_major" -lt 2; then
+ 	  gcc_cv_ld_hidden=no
+@@ -10524,6 +10512,20 @@ else
+       hppa64*-*-hpux* | ia64*-*-hpux*)
+ 	gcc_cv_ld_hidden=yes
+ 	;;
++      *-*-solaris2.8*)
++        # .hidden support was backported to Solaris 8, starting with ld
++	# version 1.276.
++	if test "$ld_vers_minor" -ge 276; then
++	  gcc_cv_ld_hidden=yes
++	else
++	  gcc_cv_ld_hidden=no
++	fi
++	;;
++      *-*-solaris2.9* | *-*-solaris2.1[0-9]*)
++	# Support for .hidden in Sun ld appeared in Solaris 9 FCS, but
++	# .symbolic was only added in Solaris 9 12/02.
++        gcc_cv_ld_hidden=yes
++	;;
+       *)
+ 	gcc_cv_ld_hidden=no
+ 	;;
+@@ -10577,7 +10579,7 @@ L2:' > conftest.s
+   # arbitrary sections are supported and try the test.
+   as_ver=`$gcc_cv_as --version 2>/dev/null | sed 1q`
+   if echo "$as_ver" | grep GNU > /dev/null; then
+-    as_ver=`echo $as_ver | sed -e 's/GNU assembler \([0-9.][0-9.]*\).*/\1/'`
++    as_ver=`echo $as_ver | gsed -e 's/GNU assembler [^0-9]\+\([0-9.][0-9.]*\).*/\1/'`
+     as_major=`echo $as_ver | sed 's/\..*//'`
+     as_minor=`echo $as_ver | sed 's/[^.]*\.\([0-9]*\).*/\1/'`
+     if test $as_major -eq 2 && test $as_minor -lt 11
+-- 
+1.7.6
+

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/package_def.mk	2011-09-01 09:19:39 UTC (rev 15485)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/package_def.mk	2011-09-01 10:41:42 UTC (rev 15486)
@@ -1,4 +1,7 @@
 ###  Package Section  ###
+
+# Ada awaits being built.
+
 PACKAGES  = CSWgcc4ada
 CATALOGNAME_CSWgcc4ada        = gcc4ada
 SPKG_DESC_CSWgcc4ada        = GNU C ADA Compiler
@@ -14,237 +17,61 @@
 RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibiconv2
 RUNTIME_DEP_PKGS_CSWgcc4ada += CSWlibgmp10
 
-PACKAGES += CSWgcc4adart
-CATALOGNAME_CSWgcc4adart      = gcc4adart
-SPKG_DESC_CSWgcc4adart      = GNU C ADA Compiler Run Time
-PKGFILES_CSWgcc4adart  = $(libdir)/.*libgnat.*\.so.*
-PKGFILES_CSWgcc4adart += $(libdir)/.*libgnarl.*\.so.*
-RUNTIME_DEP_PKGS_CSWgcc4adart       = CSWgcc4corert
+# PACKAGES += CSWgcc4adart
+# CATALOGNAME_CSWgcc4adart      = gcc4adart
+# SPKG_DESC_CSWgcc4adart      = GNU C ADA Compiler Run Time
+# PKGFILES_CSWgcc4adart  = $(libdir)/.*libgnat.*\.so.*
+# PKGFILES_CSWgcc4adart += $(libdir)/.*libgnarl.*\.so.*
+# RUNTIME_DEP_PKGS_CSWgcc4adart       = CSWgcc4corert
 
-PACKAGES += CSWgcc4core
-CATALOGNAME_CSWgcc4core       = gcc4core
-SPKG_DESC_CSWgcc4core       = GNU C Compiler
-RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp10
+# PACKAGES += CSWgcc4core
+# CATALOGNAME_CSWgcc4core       = gcc4core
+# SPKG_DESC_CSWgcc4core       = GNU C Compiler
+# RUNTIME_DEP_PKGS_CSWgcc4core = CSWgcc4corert CSWbinutils
+# RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibmpfr4
+# RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
+# RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibgmp10
 
-PACKAGES += CSWgcc4corert
-CATALOGNAME_CSWgcc4corert     = gcc4corert
-SPKG_DESC_CSWgcc4corert     = GNU C Compiler Run Time
-PKGFILES_CSWgcc4corert  = $(libdir)/.*libgcc_s.*\.so.*
-PKGFILES_CSWgcc4corert += $(libdir)/.*libgomp.*\.so.*
-PKGFILES_CSWgcc4corert += $(libdir)/.*libssp.*\.so.*
+# PACKAGES += CSWgcc4corert
+# CATALOGNAME_CSWgcc4corert     = gcc4corert
+# SPKG_DESC_CSWgcc4corert     = GNU C Compiler Run Time
+# PKGFILES_CSWgcc4corert  = $(libdir)/.*libgcc_s.*\.so.*
+# PKGFILES_CSWgcc4corert += $(libdir)/.*libgomp.*\.so.*
+# PKGFILES_CSWgcc4corert += $(libdir)/.*libssp.*\.so.*
 
-PACKAGES += CSWgcc4g++
-CATALOGNAME_CSWgcc4g++ = gcc4g++
-SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++  = $(bindir)/.*g\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/.*c\+\+
-PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
-PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
-PKGFILES_CSWgcc4g++ += $(libdir)/.*libsupc\+\+.*a
-PKGFILES_CSWgcc4g++ += .*/gcc4/man/.*g\+\+.1
-PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
-PKGFILES_CSWgcc4g++ += $(includedir)/c\+\+/(\d+(?:\.\d+)*)/ostream.*
-RUNTIME_DEP_PKGS_CSWgcc4g++  = CSWgcc4g++rt
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibgmp10
+# PACKAGES += CSWgcc4g++rt
+# CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
+# SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
+# RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert
+# PKGFILES_CSWgcc4g++rt  = $(libdir)/.*libstdc.*\.so.*
+# supc was not found anywhere
+# PKGFILES_CSWgcc4g++rt += $(libdir)/.*libsupc\+\+.*\.so.*
 
-PACKAGES += CSWgcc4g++rt
-CATALOGNAME_CSWgcc4g++rt = gcc4g++rt
-SPKG_DESC_CSWgcc4g++rt = GNU C++ Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4g++rt = CSWgcc4corert
-PKGFILES_CSWgcc4g++rt  = $(libdir)/.*libstdc.*\.so.*
-PKGFILES_CSWgcc4g++rt += $(libdir)/.*libsupc\+\+.*\.so.*
+# PACKAGES += CSWgcc4gfortranrt
+# CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt
+# SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time
+# RUNTIME_DEP_PKGS_CSWgcc4gfortranrt  = CSWgcc4corert
+# PKGFILES_CSWgcc4gfortranrt  = $(libdir)/.*libgfortran.*\.so.*
 
+# PACKAGES += CSWgcc4javart
+# CATALOGNAME_CSWgcc4javart     = gcc4javart
+# SPKG_DESC_CSWgcc4javart     = GNU Java Compiler Run Time
+# RUNTIME_DEP_PKGS_CSWgcc4javart      = CSWgcc4corert CSWgcc4g++rt
+# PKGFILES_CSWgcc4javart  = $(libdir)/.*libgij.*\.so.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*libffi.*\.so.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*lib-gnu-awt.*\.so.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*security/classpath.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*logging.properties
+# PKGFILES_CSWgcc4javart += $(libdir)/.*pkgconfig.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*gcj.*\.so.*
+# PKGFILES_CSWgcc4javart += $(libdir)/.*libgcj.*\.so.*
 
-PACKAGES += CSWgcc4gfortran
-CATALOGNAME_CSWgcc4gfortran   = gcc4gfortran
-SPKG_DESC_CSWgcc4gfortran   = GNU Fortran Compiler
-RUNTIME_DEP_PKGS_CSWgcc4gfortran    = CSWgcc4gfortranrt
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibgmp10
-PKGFILES_CSWgcc4gfortran  = $(bindir)/.*gfortran
-PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
-PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
-PKGFILES_CSWgcc4gfortran += .*/gcc4/man/.*gfortran.1
-PKGFILES_CSWgcc4gfortran += .*/gcc4/info/gfortran.*
-
-PACKAGES += CSWgcc4gfortranrt
-CATALOGNAME_CSWgcc4gfortranrt = gcc4gfortranrt
-SPKG_DESC_CSWgcc4gfortranrt = GNU Fortran Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4gfortranrt  = CSWgcc4corert
-PKGFILES_CSWgcc4gfortranrt  = $(libdir)/.*libgfortran.*\.so.*
-
-PACKAGES += CSWgcc4java
-CATALOGNAME_CSWgcc4java       = gcc4java
-SPKG_DESC_CSWgcc4java       = GNU Java Compiler
-RUNTIME_DEP_PKGS_CSWgcc4java        = CSWgcc4corert CSWgcc4javart
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWzlib
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibgmp10
-
-PKGFILES_CSWgcc4java  = $(bindir)/.*gcj.*
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-scan
-PKGFILES_CSWgcc4java += $(bindir)/.*jv-convert
-PKGFILES_CSWgcc4java += $(bindir)/.*jcf-dump
-PKGFILES_CSWgcc4java += $(bindir)/.*grmi.*
-PKGFILES_CSWgcc4java += $(bindir)/.*grepjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjnih
-PKGFILES_CSWgcc4java += $(bindir)/.*gij
-PKGFILES_CSWgcc4java += $(bindir)/.*fastjar
-PKGFILES_CSWgcc4java += $(bindir)/.*gjar.*
-PKGFILES_CSWgcc4java += $(bindir)/.*gjavah
-PKGFILES_CSWgcc4java += $(bindir)/.*gorbd
-PKGFILES_CSWgcc4java += $(bindir)/.*addr2name.awk
-PKGFILES_CSWgcc4java += $(bindir)/.*gappletviewer
-PKGFILES_CSWgcc4java += $(bindir)/.*gkeytool
-PKGFILES_CSWgcc4java += $(bindir)/.*gserialver
-PKGFILES_CSWgcc4java += $(bindir)/.*gtnameserv
-PKGFILES_CSWgcc4java += $(bindir)/.*gnative2ascii
-PKGFILES_CSWgcc4java += $(bindir)/.*gc-analyze
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gcj.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gij.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jv.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/jcf.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/grmi.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*jar.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*jni.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*java.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gorbd.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gapplet.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gkeytool.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gserialver.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gtnameserv.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gnative2ascii.*
-PKGFILES_CSWgcc4java += .*/gcc4/man/.*/gc-analyze.*
-PKGFILES_CSWgcc4java += .*/gcc4/share/java/.*
-PKGFILES_CSWgcc4java += $(libdir)/.*libgij.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*libffi.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*lib-gnu-awt.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*security.*
-PKGFILES_CSWgcc4java += $(libdir)/.*logging.properties
-PKGFILES_CSWgcc4java += $(libdir)/.*pkgconfig.*
-PKGFILES_CSWgcc4java += $(libdir)/.*gcj.*a
-PKGFILES_CSWgcc4java += $(libdir)/.*libgcj.*a
-PKGFILES_CSWgcc4java += $(libexecdir)/.*collect.*
-PKGFILES_CSWgcc4java += $(libexecdir)/.*jvgenmain
-PKGFILES_CSWgcc4java += $(libexecdir)/.*jc1.*
-PKGFILES_CSWgcc4java += .*/gcc4/info/gcj.*
-PKGFILES_CSWgcc4java += $(includedir)/.*gcj/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*awt/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*classpath/.*
-PKGFILES_CSWgcc4java += $(includedir)/.*java.*
-PKGFILES_CSWgcc4java += $(includedir)/.*ffi.h
-PKGFILES_CSWgcc4java += $(includedir)/.*org/.*
-
-PACKAGES += CSWgcc4javart
-CATALOGNAME_CSWgcc4javart     = gcc4javart
-SPKG_DESC_CSWgcc4javart     = GNU Java Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4javart      = CSWgcc4corert CSWgcc4g++rt
-PKGFILES_CSWgcc4javart  = $(libdir)/.*libgij.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*libffi.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*lib-gnu-awt.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*security/classpath.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*logging.properties
-PKGFILES_CSWgcc4javart += $(libdir)/.*pkgconfig.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*gcj.*\.so.*
-PKGFILES_CSWgcc4javart += $(libdir)/.*libgcj.*\.so.*
-
-PACKAGES += CSWgcc4objc
-CATALOGNAME_CSWgcc4objc       = gcc4objc
-SPKG_DESC_CSWgcc4objc       = GNU Objective C Compiler
-PKGFILES_CSWgcc4objc  = $(libexecdir)/.*cc1obj
-PKGFILES_CSWgcc4objc += $(libdir)/.*libobjc.*a
-PKGFILES_CSWgcc4objc += $(includedir)/.*objc/.*
-PKGFILES_CSWgcc4objc += $(libdir)/.*/include/objc/.*
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWgcc4objcrt
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibiconv2
-RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
-
-
-PACKAGES += CSWgcc4objcrt
-CATALOGNAME_CSWgcc4objcrt     = gcc4objcrt
-SPKG_DESC_CSWgcc4objcrt     = GNU Objective C Compiler Run Time
-RUNTIME_DEP_PKGS_CSWgcc4objcrt      = CSWgcc4corert
-PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.*\.so.*
+# PACKAGES += CSWgcc4objcrt
+# CATALOGNAME_CSWgcc4objcrt     = gcc4objcrt
+# SPKG_DESC_CSWgcc4objcrt     = GNU Objective C Compiler Run Time
+# RUNTIME_DEP_PKGS_CSWgcc4objcrt      = CSWgcc4corert
+# PKGFILES_CSWgcc4objcrt = $(libdir)/.*libobjc.*\.so.*
  
-## Source URLs
-VENDOR_URL = http://gcc.gnu.org
-
-## Copyright File
-LICENSE = COPYING3
-
+# No idea what was that for.
 DISTFILES += CSWgcc4core.space
 
-define CSWgcc4core_postinstall
-#!/bin/sh
-
-Error()
-{
-	echo "=====> postinstall Error: $$1" >&2
-	exit 1
-}
-
-OS_REV="`/usr/bin/uname -r | sed -e 's/[^.]*//'`"
-case `/usr/bin/uname -p` in
-	"sparc") OS_TARGET="sparc-sun-solaris2.8" ;;
-	 "i386") OS_TARGET="i386-pc-solaris2$${OS_REV}" ;;
-esac
-
-TOOLS_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/libexec/gcc"
-TOOLS_DIR="$${TOOLS_DIR}/$${OS_TARGET}/$(VERSION)/install-tools"
-MKHEADERS_CMD="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/bin/mkheaders"
-INCLUDE_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/lib/gcc"
-INCLUDE_DIR="$${INCLUDE_DIR}/$${OS_TARGET}/$(VERSION)/include"
-
-cat << _EOF_
-******************************************************************************
-* NOTICE: Fixing the system headers
-*
-* Do not forget: whenever your system headers change 
-* Run the $${MKHEADERS_CMD} script!
-******************************************************************************
-_EOF_
-
-if [ -f $${TOOLS_DIR}/mkheaders ]; then
-	cp $${TOOLS_DIR}/mkheaders $${MKHEADERS_CMD}
-	installf $${PKGINST} "$${MKHEADERS_CMD}"
-else
-	Error "$${TOOLS_DIR}/mkheaders Not Found"
-fi
-
-if [ -f $${MKHEADERS_CMD} ];then
-	chmod 0755 $${MKHEADERS_CMD} 2>/dev/null
-	chown root:bin $${MKHEADERS_CMD} 2>/dev/null
-	"$${MKHEADERS_CMD}" || Error "$${MKHEADERS_CMD} Failed."
-else
-	Error "Could not find $${MKHEADERS_CMD}"
-fi
-
-if [ -d $${INCLUDE_DIR} ]; then
-	chmod 0755 $${INCLUDE_DIR} || Error "Failed to chmod $${INCLUDE_DIR}"
-	chown -R root:bin $${INCLUDE_DIR} || 
-			Error "Failed to change ownership for $${INCLUDE_DIR}"
-	find $${INCLUDE_DIR} -print | installf $${PKGINST} -
-fi
-
-
-cat << _EOF_
-******************************************************************************
-* NOTICE: Successfully fixed system headers
-*
-* Do not forget: whenever your system headers change 
-* Run the $${MKHEADERS_CMD} script!
-******************************************************************************
-_EOF_
-	
-installf -f $${PKGINST}
-
-exit 0
-endef

Copied: csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/scripts.mk (from rev 15435, csw/mgar/pkg/gcc4/branches/bootstrap-4.6/files/scripts.mk)
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/scripts.mk	                        (rev 0)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-3.4/files/scripts.mk	2011-09-01 10:41:42 UTC (rev 15486)
@@ -0,0 +1,66 @@
+define CSWgcc4core_postinstall
+#!/bin/sh
+
+Error()
+{
+	echo "=====> postinstall Error: $$1" >&2
+	exit 1
+}
+
+OS_REV="`/usr/bin/uname -r | sed -e 's/[^.]*//'`"
+case `/usr/bin/uname -p` in
+	"sparc") OS_TARGET="sparc-sun-solaris2.8" ;;
+	 "i386") OS_TARGET="i386-pc-solaris2$${OS_REV}" ;;
+esac
+
+TOOLS_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/libexec/gcc"
+TOOLS_DIR="$${TOOLS_DIR}/$${OS_TARGET}/$(VERSION)/install-tools"
+MKHEADERS_CMD="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/bin/mkheaders"
+INCLUDE_DIR="$${PKG_INSTALL_ROOT}/opt/csw/gcc4/lib/gcc"
+INCLUDE_DIR="$${INCLUDE_DIR}/$${OS_TARGET}/$(VERSION)/include"
+
+cat << _EOF_
+******************************************************************************
+* NOTICE: Fixing the system headers
+*
+* Do not forget: whenever your system headers change 
+* Run the $${MKHEADERS_CMD} script!
+******************************************************************************
+_EOF_
+
+if [ -f $${TOOLS_DIR}/mkheaders ]; then
+	cp $${TOOLS_DIR}/mkheaders $${MKHEADERS_CMD}
+	installf $${PKGINST} "$${MKHEADERS_CMD}"
+else
+	Error "$${TOOLS_DIR}/mkheaders Not Found"
+fi
+
+if [ -f $${MKHEADERS_CMD} ];then
+	chmod 0755 $${MKHEADERS_CMD} 2>/dev/null
+	chown root:bin $${MKHEADERS_CMD} 2>/dev/null
+	"$${MKHEADERS_CMD}" || Error "$${MKHEADERS_CMD} Failed."
+else
+	Error "Could not find $${MKHEADERS_CMD}"
+fi
+
+if [ -d $${INCLUDE_DIR} ]; then
+	chmod 0755 $${INCLUDE_DIR} || Error "Failed to chmod $${INCLUDE_DIR}"
+	chown -R root:bin $${INCLUDE_DIR} || 
+			Error "Failed to change ownership for $${INCLUDE_DIR}"
+	find $${INCLUDE_DIR} -print | installf $${PKGINST} -
+fi
+
+
+cat << _EOF_
+******************************************************************************
+* NOTICE: Successfully fixed system headers
+*
+* Do not forget: whenever your system headers change 
+* Run the $${MKHEADERS_CMD} script!
+******************************************************************************
+_EOF_
+	
+installf -f $${PKGINST}
+
+exit 0
+endef

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.



More information about the devel mailing list