[csw-devel] SF.net SVN: gar:[4197] csw/mgar/pkg/gcc4/trunk

valholla at users.sourceforge.net valholla at users.sourceforge.net
Sun Apr 5 17:54:10 CEST 2009


Revision: 4197
          http://gar.svn.sourceforge.net/gar/?rev=4197&view=rev
Author:   valholla
Date:     2009-04-05 15:54:10 +0000 (Sun, 05 Apr 2009)

Log Message:
-----------
switch from Sun Studio to gcc

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/Makefile
    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

Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile	2009-04-05 13:48:44 UTC (rev 4196)
+++ csw/mgar/pkg/gcc4/trunk/Makefile	2009-04-05 15:54:10 UTC (rev 4197)
@@ -19,8 +19,8 @@
 ## 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
+#PATCHFILES  = re-enable-alloc.diff
+#PATCHFILES += split-insn-attrtab.diff
 
 ## build options
 CONFIGURE_ARGS  = --prefix=$(BUILD_PREFIX)/gcc4
@@ -41,7 +41,7 @@
 CONFIGURE_ARGS += --enable-objc-gc
 CONFIGURE_ARGS += --enable-threads=posix 
 CONFIGURE_ARGS += --enable-stage1-languages=c
-CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc
+CONFIGURE_ARGS += --enable-languages=ada,c,c++,fortran,java,objc
 
 ## For cleanliness I split the Configuration into separate files
 include files/amd_merge.mk

Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-04-05 13:48:44 UTC (rev 4196)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-04-05 15:54:10 UTC (rev 4197)
@@ -14,7 +14,6 @@
 AMD_MERGE_TARGETS  = merge-dirs-amd
 AMD_MERGE_TARGETS += merge-i386-files
 AMD_MERGE_TARGETS += merge-amd64-files
-AMD_MERGE_TARGETS += merge-strip-amd
 
 merge-amd: $(AMD_MERGE_TARGETS)
 	$(_DBG)$(MAKECOOKIE)
@@ -45,13 +44,6 @@
 	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/libexec $(PKGROOT))
 	$(_DBG)$(MAKECOOKIE)
 
-merge-strip-amd:
-	@(echo "[===== Stripping Merged Binaries =====]")
-	$(_DBG)(stripbin $(PPREFIX)/bin/i386)
-	$(_DBG)(stripbin $(PPREFIX)/bin/amd64)
-	$(_DBG)(stripbin $(PPREFIX)/bin)
-	$(_DBG)$(MAKECOOKIE)
-
 ifeq ($(shell uname -p), i386)
 ISAEXEC_DIRS   = /opt/csw/gcc4/bin
 ISAEXEC_FILES += /opt/csw/gcc4/bin/gcc

Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-04-05 13:48:44 UTC (rev 4196)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-04-05 15:54:10 UTC (rev 4197)
@@ -1,34 +1,31 @@
 
-COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH)
-WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH)
-PATCHDIR = $(WORKDIR)/$(GARNAME)-$(GARVERSION)
+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
-WORKSRC = $(OBJECT_DIR)
-DIRPATHS = 
-OPTFLAGS =
-
-CONFIG_SHELL = /bin/ksh
-GARCOMPILER = SOS11
-SOS11_CC = /opt/studio/SOS11/SUNWspro/bin/cc -xO3 -xarch=v8
-CFLAGS = -I/opt/csw/include
-CPPFLAGS = -I/opt/csw/include
-CXXFLAGS = -I/opt/csw/include
-LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
-BOOT_CFLAGS = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe
+PKGROOT       = $(abspath $(WORKROOTDIR)/pkgroot-$(GARCH))
+OBJECT_DIR    = $(WORKDIR)/objdir
+WORKSRC       = $(OBJECT_DIR)
+DIRPATHS      = 
+OPTFLAGS      =
+CONFIG_SHELL  = /bin/bash
+GARCOMPILER   = GCC3
+GCC3_CC       = /opt/csw/gcc3/bin/gcc -g -O2 -mcpu=v8 -pipe
+CFLAGS        = -I/opt/csw/include
+CPPFLAGS      = -I/opt/csw/include
+CXXFLAGS      = -I/opt/csw/include
+LDFLAGS       = -L/opt/csw/lib -R/opt/csw/lib
+BOOT_CFLAGS   = -I/opt/csw/include -mcpu=v8 -g -O2 -pipe
 BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
 
 ifeq ($(shell uname -p),i386)
 ifeq ($(shell uname -r),5.10)
-    GARCOMPILER = SOS12
-    SOS12_CC = /opt/studio/SOS12/SUNWspro/bin/cc
-    BOOT_CFLAGS = -I/opt/csw/include -g -O2 -pipe
+    GCC3_CC       = /opt/csw/gcc3/bin/gcc -g -O2 -pipe
+    BOOT_CFLAGS   = -I/opt/csw/include -g -O2 -pipe
     BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
 else
-    GARCOMPILER = SOS11
-    SOS11_CC = /opt/studio/SOS11/SUNWspro/bin/cc -xarch=386
-    BOOT_CFLAGS = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe
+    GCC3_CC       = /opt/csw/gcc3/bin/gcc -march=i386 -g -O2 -pipe
+    BOOT_CFLAGS   = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe
     BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
 endif
 endif
@@ -36,14 +33,13 @@
 export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS
 export LDFLAGS BOOT_CFLAGS BOOT_LDFLAGS
 
-FIXCONFIG_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib
-STRIP_DIRS += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin
-
-CONFIGURE_SCRIPTS = objdir
-TEST_SCRIPTS = skip
+FIXCONFIG_DIRS         += $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib
+STRIP_DIRS             += $(DESTDIR)$(BUILD_PREFIX)/gcc4/bin
+CONFIGURE_SCRIPTS       = objdir
+TEST_SCRIPTS            = skip
 post-configure-modulated: fix-bootflags
-MERGE_SCRIPTS_isa-i386 = amd
+MERGE_SCRIPTS_isa-i386  = amd
 
 ## Run checkpkg Manually
-ENABLE_CHECK = 0
+ENABLE_CHECK            = 0
 

Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-04-05 13:48:44 UTC (rev 4196)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-04-05 15:54:10 UTC (rev 4197)
@@ -4,6 +4,8 @@
 PACKAGES += CSWgcc4objc CSWgcc4objcrt CSWgcc4g++ CSWgcc4g++rt
  
 ## Define Package Catalog Names
+CATALOGNAME_CSWgcc4ada        = gcc4ada
+CATALOGNAME_CSWgcc4adart      = gcc4adart
 CATALOGNAME_CSWgcc4core       = gcc4core
 CATALOGNAME_CSWgcc4corert     = gcc4corert
 CATALOGNAME_CSWgcc4g++        = gcc4g++
@@ -16,6 +18,8 @@
 CATALOGNAME_CSWgcc4objcrt     = gcc4objcrt
 
 ## Source URLs
+SPKG_SOURCEURL_CSWgcc4ada        = http://gcc.gnu.org
+SPKG_SOURCEURL_CSWgcc4adart      = http://gcc.gnu.org
 SPKG_SOURCEURL_CSWgcc4core       = http://gcc.gnu.org
 SPKG_SOURCEURL_CSWgcc4corert     = http://gcc.gnu.org
 SPKG_SOURCEURL_CSWgcc4g++        = http://gcc.gnu.org
@@ -28,6 +32,8 @@
 SPKG_SOURCEURL_CSWgcc4objcrt     = http://gcc.gnu.org
 
 ## Copyright File
+LICENSE_CSWgcc4ada        = COPYING3
+LICENSE_CSWgcc4adart      = COPYING3
 LICENSE_CSWgcc4core       = COPYING3
 LICENSE_CSWgcc4corert     = COPYING3
 LICENSE_CSWgcc4g++        = COPYING3
@@ -40,6 +46,8 @@
 LICENSE_CSWgcc4objcrt     = COPYING3
 
 ## Define Package Descriptions
+SPKG_DESC_CSWgcc4ada        = GNU C ADA Compiler
+SPKG_DESC_CSWgcc4adart      = GNU C ADA Compiler Run Time
 SPKG_DESC_CSWgcc4core       = GNU C Compiler
 SPKG_DESC_CSWgcc4corert     = GNU C Compiler Run Time
 SPKG_DESC_CSWgcc4g++        = GNU C++ Compiler
@@ -53,6 +61,8 @@
 
 ## Define Dependencies 
 COMMON_REQUIRE                   = CSWiconv CSWlibgmp CSWlibmpfr
+REQUIRED_PKGS_CSWgcc4adart       = CSWggettextrt $(COMMON_REQUIRE)
+REQUIRED_PKGS_CSWgcc4ada         = CSWgcc4adart $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4corert      = CSWggettextrt $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4core        = CSWgcc4corert $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4g++rt       = CSWgcc4corert CSWiconv
@@ -67,6 +77,13 @@
 
 ## Define the Contents of the Packages
 
+## gcc4ada Definitions
+PKGFILES_CSWgcc4ada  = .*/libexec/.*gnat1
+PKGFILES_CSWgcc4ada += .*/adalib/.*
+PKGFILES_CSWgcc4ada += .*/adainclude/.*
+PKGFILES_CSWgcc4ada += .*/info/.*gnat.*
+PKGFILES_CSWgcc4ada += .*/bin/gnat.*
+
 ## gcc4gfortran Definitions
 PKGFILES_CSWgcc4gfortran  = .*/bin/.*gfortran
 PKGFILES_CSWgcc4gfortran += .*/libexec/.*f951
@@ -133,6 +150,10 @@
 
 #######  RunTime Packages
 
+## gcc4adart
+PKGFILES_CSWgcc4adart = .*/lib/.*libgnat.*
+PKGFILES_CSWgcc4adart = .*/lib/.*libgnarl.*
+
 ## gcc4corert
 PKGFILES_CSWgcc4corert  = .*/lib/.*libgcc_s.*
 PKGFILES_CSWgcc4corert += .*/lib/.*libgomp.*


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