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

valholla at users.sourceforge.net valholla at users.sourceforge.net
Mon Mar 9 17:11:42 CET 2009


Revision: 3679
          http://gar.svn.sourceforge.net/gar/?rev=3679&view=rev
Author:   valholla
Date:     2009-03-09 16:11:42 +0000 (Mon, 09 Mar 2009)

Log Message:
-----------
working copy checkin

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/Makefile
    csw/mgar/pkg/gcc4/trunk/files/configure_def.mk

Added Paths:
-----------
    csw/mgar/pkg/gcc4/trunk/files/gar_override.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-09 14:00:31 UTC (rev 3678)
+++ csw/mgar/pkg/gcc4/trunk/Makefile	2009-03-09 16:11:42 UTC (rev 3679)
@@ -1,63 +1,25 @@
-GARNAME = gcc
-GARVERSION = 4.3.3
-CATEGORIES = lang
+GARNAME      = gcc
+GARVERSION   = 4.3.3
+CATEGORIES   = lang
 
-DESCRIPTION = The GNU Compiler Collection
+DESCRIPTION  = The GNU Compiler Collection
 define BLURB
 	The GNU Compiler Collection includes front ends for C, C++, 
 	Objective-C, Fortran, Java, and Ada, as well as libraries 
 	for these languages (libstdc++, libgcj,...).
 endef
 
-DISTFILES  = $(GARNAME)-$(GARVERSION).tar.bz2
-
+DISTFILES    = $(GARNAME)-$(GARVERSION).tar.bz2
 MASTER_SITES = http://gcc.gnu.org/
-SPKG_SOURCEURL = http://gcc.releasenotes.org/releases/
 
 # We define upstream file regex so we can be notifed 
 # of new upstream software release
 UFILES_REGEX = $(GARNAME)-(\d+(?:\.\d+)*).tar.bz2
 
-###  Scripts Section  ###
-
-## Directory to do all the work from
-OBJECT_DIR = $(WORKDIR)/$(DISTNAME)/objdir
-## Change default $(WORKSRC) to the $(OBJECT_DIR)
-WORKSRC = $(OBJECT_DIR)
-
-## After sucessful source extraction
-## Create $(OBJECT_DIR) to build in
-post-extract-$(addprefix post-extract-,$(MODULATIONS)):
-	echo "==> Creating Object Dir for Building"
-	@( mkdir $(OBJECT_DIR) )
-	$(DONADA)
-
-## Override standard configure
-CONFIGURE_SCRIPTS = objdir
-## instead of changing to $(WORKSRC) and running configure
-## Run it from the $(OBJECT_DIR)
-configure-objdir:
-	echo "==> Running Configure from $(OBJECT_DIR)"
-	cd $(OBJECT_DIR) && $(CONFIGURE_ENV) ../configure $(CONFIGURE_ARGS)
-	$(DONADA)
-
-## Package Check will fail for self dependencies
-## i.e. CSWgcc4core is dependent on CSWgcc4corert
-## if CSWgcc4corert is not installed on the build system
-## Package Creation will fail and the remaining packages
-## will not get created.  
-##      ******  Run checkpkg Manually  *****
-ENABLE_CHECK = 0
-
-## Tests take a very long time
-TEST_SCRIPTS = skip
-
-test-skip:
-	$(DONADA)
-
-## For cleanliness I moved the Configuration Definition
-## And Packaging Definitions to their own file
+## For cleanliness I split the Configuration into separate files
+include files/gar_override.mk
 include files/configure_def.mk  
+include files/pkg_scripts.mk
 include files/package_def.mk
 
 include gar/category.mk

Modified: csw/mgar/pkg/gcc4/trunk/files/configure_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/configure_def.mk	2009-03-09 14:00:31 UTC (rev 3678)
+++ csw/mgar/pkg/gcc4/trunk/files/configure_def.mk	2009-03-09 16:11:42 UTC (rev 3679)
@@ -1,32 +1,23 @@
 
-###  Configure Section  ###
-CPPFLAGS = -I/opt/csw/include
-CFLAGS   = -I/opt/csw/include
-CXXFLAGS = -I/opt/csw/include
-LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib/\\\\\\\$\$ISALIST -R/opt/csw/lib
-OPTFLAGS =
-
 ## Install everythong /opt/csw/gcc4 instead of /opt/csw
-BUILD_PREFIX = /opt/csw/gcc4
+prefix = /opt/csw/gcc4
 
-OBJECT_DIR  = $(WORKDIR)/$(DISTNAME)/objdir
-WORKSRC     = $(OBJECT_DIR)
-
-CONFIGURE_ARGS  = $(DIRPATHS)
+CONFIGURE_ARGS  = --prefix=$(prefix)
+CONFIGURE_ARGS += --exec-prefix=$(prefix)
 CONFIGURE_ARGS += --enable-libada
 CONFIGURE_ARGS += --enable-libssp
 CONFIGURE_ARGS += --enable-objc-gc
 CONFIGURE_ARGS += --enable-threads=posix
 CONFIGURE_ARGS += --enable-shared
-CONFIGURE_ARGS += --with-mpfr=$(prefix)
-CONFIGURE_ARGS += --with-gmp=$(prefix)
+CONFIGURE_ARGS += --with-mpfr=/opt/csw
+CONFIGURE_ARGS += --with-gmp=/opt/csw
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
 CONFIGURE_ARGS += --without-gnu-ld
 CONFIGURE_ARGS += --with-ld=/usr/ccs/bin/ld
-CONFIGURE_ARGS += --with-build-time-tools=$(bindir)
+CONFIGURE_ARGS += --with-build-time-tools=/opt/csw/bin
 ## Do not try to build Ada
 ## Ada must be build with using GCC because the source uses some Ada Code
 ## Checkout gcc4ada* packages from svn if you wish to build Ada
 CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc
-CONFIGURE_ARGS += LDFLAGS=-R/opt/csw/lib
+

Added: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	                        (rev 0)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-03-09 16:11:42 UTC (rev 3679)
@@ -0,0 +1,27 @@
+
+
+WORKDIR       = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)
+COOKIEDIR     = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)
+INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)
+OBJECT_DIR    = $(WORKDIR)/$(DISTNAME)/objdir
+WORKSRC       = $(OBJECT_DIR)
+DIRPATHS      =
+OPTFLAGS      =
+CONFIG_SHELL  = /opt/csw/bin/bash
+
+
+CPPFLAGS = -I/opt/csw/include
+CFLAGS   = -I/opt/csw/include
+CXXFLAGS = -I/opt/csw/include
+LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib/\\\\\\\$\$ISALIST -R/opt/csw/lib
+BOOT_CFLAGS  = $(CFLAGS) -g -O2
+BOOT_LDFLAGS = $(LDFLAGS)
+
+COMMON_EXPORTS += CONFIG_SHELL BOOT_CFLAGS BOOT_LDFLAGS
+
+CONFIGURE_SCRIPTS = objdir
+TEST_SCRIPTS = skip
+
+## Run checkpkg Manually
+ENABLE_CHECK = 0
+

Added: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	                        (rev 0)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-03-09 16:11:42 UTC (rev 3679)
@@ -0,0 +1,17 @@
+
+## Create $(OBJECT_DIR) to build in
+post-extract-$(addprefix post-extract-,$(MODULATIONS)):
+	echo "==> Creating Object Dir for Building"
+	@( mkdir $(OBJECT_DIR) )
+	$(DONADA)
+
+## instead of changing to $(WORKSRC) and running configure
+## Run it from the $(OBJECT_DIR)
+configure-objdir:
+	echo "==> Running Configure from $(OBJECT_DIR)"
+	cd $(OBJECT_DIR) && $(CONFIGURE_ENV) ../configure $(CONFIGURE_ARGS)
+	$(DONADA)
+
+test-skip:
+	$(DONADA)
+


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