Revision: 4007
http://gar.svn.sourceforge.net/gar/?rev=4007&view=rev
Author: valholla
Date: 2009-03-28 03:57:44 +0000 (Sat, 28 Mar 2009)
Log Message:
-----------
working copy
Modified Paths:
--------------
csw/mgar/pkg/gcc4/trunk/Makefile
csw/mgar/pkg/gcc4/trunk/checksums
csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
csw/mgar/pkg/gcc4/trunk/files/package_def.mk
csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile 2009-03-28 00:58:03 UTC (rev 4006)
+++ csw/mgar/pkg/gcc4/trunk/Makefile 2009-03-28 03:57:44 UTC (rev 4007)
@@ -16,6 +16,12 @@
# of new upstream software release
UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
+## The following patches address bug 29442
+## http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29442
+## Patch to Reenable alloca() on non-GCC compilers
+PATCHFILES = re-enable-alloc.diff
+PATCHFILES += split-insn-attrtab.diff
+
## For cleanliness I split the Configuration into separate files
include files/gar_override.mk
include files/configure_def.mk
Modified: csw/mgar/pkg/gcc4/trunk/checksums
===================================================================
--- csw/mgar/pkg/gcc4/trunk/checksums 2009-03-28 00:58:03 UTC (rev 4006)
+++ csw/mgar/pkg/gcc4/trunk/checksums 2009-03-28 03:57:44 UTC (rev 4007)
@@ -1 +1,3 @@
cc3c5565fdb9ab87a05ddb106ba0bd1f download/gcc-4.3.3.tar.bz2
+9644641dee1c5433930319b20710dca3 download/re-enable-alloc.diff
+57900f0dad9f424a43e7d1aa502070b8 download/split-insn-attrtab.diff
Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-03-28 00:58:03 UTC (rev
4006)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk 2009-03-28 03:57:44 UTC (rev
4007)
@@ -1,6 +1,6 @@
-AMD_BASE = $(WORKROOTDIR)/install-isa-i386-5.10/
-I386_BASE = $(WORKROOTDIR)/install-isa-i386-5.8/
+AMD_BASE = $(WORKROOTDIR)/install-isa-i386-5.10-i386/
+I386_BASE = $(WORKROOTDIR)/install-isa-i386-5.8-i386/
MPREFIX = opt/csw/gcc4
APREFIX = $(AMD_BASE)/$(MPREFIX)
IPREFIX = $(I386_BASE)/$(MPREFIX)
@@ -23,22 +23,20 @@
x86-merge-amd:
@(echo "===> Merging AMD64")
@(cd $(AMD_BASE); for dir in `gfind . -name "*solaris2\.10*" -type d` ;
do \
- pax -rw $$dir $(PKGROOT); done )
- @(cd $(AMD_BASE); pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT))
- @(cd $(APREFIX)/bin; pax -rw * $(PPREFIX)/bin/amd64)
- @(cd $(APREFIX)/bin/amd64; gln *-solaris2.* ../)
+ /usr/bin/pax -rw $$dir $(PKGROOT); done )
+ @(cd $(AMD_BASE); /usr/bin/pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT))
+ @(cd $(APREFIX)/bin; /usr/bin/pax -rw * $(PPREFIX)/bin/amd64)
@$(MAKECOOKIE)
x86-merge-i386:
@(echo "===> Merging I386")
- @(cd $(I386_BASE); pax -rw $(MPREFIX)/include $(PKGROOT))
- @(cd $(I386_BASE); pax -rw $(MPREFIX)/info $(PKGROOT))
- @(cd $(I386_BASE); pax -rw $(MPREFIX)/man $(PKGROOT))
- @(cd $(I386_BASE); pax -rw $(MPREFIX)/share $(PKGROOT))
- @(cd $(I386_BASE); pax -rw $(MPREFIX)/lib $(PKGROOT))
- @(cd $(I386_BASE); pax -rw $(MPREFIX)/libexec $(PKGROOT))
- @(cd $(IPREFIX)/bin; pax -rw * $(PPREFIX)/bin/i386)
- @(cd $(APREFIX)/bin/i386; gln *-solaris2.* ../)
+ @(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/include $(PKGROOT))
+ @(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/info $(PKGROOT))
+ @(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/man $(PKGROOT))
+ @(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/share $(PKGROOT))
+ @(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/lib $(PKGROOT))
+ @(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/libexec $(PKGROOT))
+ @(cd $(IPREFIX)/bin; /usr/bin/pax -rw * $(PPREFIX)/bin/i386)
@$(MAKECOOKIE)
x86-merge-strip:
Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-28 00:58:03 UTC
(rev 4006)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk 2009-03-28 03:57:44 UTC
(rev 4007)
@@ -1,6 +1,7 @@
COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH)
WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH)
+PATCHDIR = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH)
PKGROOT = $(abspath $(WORKROOTDIR)/pkgroot-$(GARCH))
OBJECT_DIR = $(WORKDIR)/objdir
Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-03-28 00:58:03 UTC
(rev 4006)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk 2009-03-28 03:57:44 UTC
(rev 4007)
@@ -13,7 +13,7 @@
CATALOGNAME_CSWgcc4java = gcc4java
CATALOGNAME_CSWgcc4javart = gcc4javart
CATALOGNAME_CSWgcc4objc = gcc4objc
-CATALOGNAME_CSWgcc4objcrt = gcc4obcrt
+CATALOGNAME_CSWgcc4objcrt = gcc4objcrt
## Source URLs
SPKG_SOURCEURL_CSWgcc4core = http://gcc.gnu.org
@@ -105,18 +105,10 @@
## gcc4g++ Definitions
PKGFILES_CSWgcc4g++ = .*/bin/.*g\+\+
PKGFILES_CSWgcc4g++ += .*/bin/.*c\+\+
-PKGFILES_CSWgcc4g++ += .*/bin/.*cpp
PKGFILES_CSWgcc4g++ += .*/libexec/.*cc1plus
-PKGFILES_CSWgcc4g++ += .*/include/c\+\+/.*
PKGFILES_CSWgcc4g++ += .*/man1/g\+\+.1
-PKGFILES_CSWgcc4g++ += .*/man1/cpp.1
-PKGFILES_CSWgcc4g++ += .*/info/cpp.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ = .*/include/.*org/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*java.*/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*gcj/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*classpath/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*awt/.*
-EXTRA_PKGFILES_EXCLUDED_CSWgcc4g++ += .*/include/.*gnu/.*
+PKGFILES_CSWgcc4g++ +=
.*/include/c\+\+/(\d+(?:\.\d+)*)/[a-fA-F,h-iH-I,k-nI-N,p-zP-Z,]+.*
+PKGFILES_CSWgcc4g++ += .*/include/c\+\+/(\d+(?:\.\d+)*)/ostream.*
## gcc4java Definitions
PKGFILES_CSWgcc4java = .*/bin/.*gcj.*
@@ -166,6 +158,7 @@
## gcc4objc Definitions
PKGFILES_CSWgcc4objc = .*/libexec/.*cc1obj
+PKGFILES_CSWgcc4objc += .*/include/.*objc/.*
####### RunTime Packages
Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-28 00:58:03 UTC
(rev 4006)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk 2009-03-28 03:57:44 UTC
(rev 4007)
@@ -1,17 +1,10 @@
-## Create lib links to conform to multi-arch standards
-post-merge-isa-sparcv8:
- @(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s sparcv9 64)
- @(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . 32)
- @(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . sparcv8)
+post-patch-modulated:
+ @(echo "==> Running autoheader and autoconf")
+ @(cd $(PATCHDIR)/gcc && autoheader)
+ @(cd $(PATCHDIR)/gcc && autoconf)
@$(MAKECOOKIE)
-post-merge-isa-i386:
- @(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s amd64 64)
- @(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . 32)
- @(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . i386)
- @$(MAKECOOKIE)
-
## Create $(OBJECT_DIR) to build in
post-extract-$(addprefix post-extract-,$(MODULATIONS)):
@(echo "==> Creating Object Dir for Building")
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
