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

valholla at users.sourceforge.net valholla at users.sourceforge.net
Tue Mar 31 17:22:09 CEST 2009


Revision: 4110
          http://gar.svn.sourceforge.net/gar/?rev=4110&view=rev
Author:   valholla
Date:     2009-03-31 15:22:09 +0000 (Tue, 31 Mar 2009)

Log Message:
-----------
working commit

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

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

Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile	2009-03-31 14:27:55 UTC (rev 4109)
+++ csw/mgar/pkg/gcc4/trunk/Makefile	2009-03-31 15:22:09 UTC (rev 4110)
@@ -22,11 +22,31 @@
 PATCHFILES  = re-enable-alloc.diff
 PATCHFILES += split-insn-attrtab.diff
 
+## build options
+CONFIGURE_ARGS  = --prefix=$(BUILD_PREFIX)/gcc4
+CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
+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 += --enable-nls
+CONFIGURE_ARGS += --with-included-gettext
+CONFIGURE_ARGS += --with-libiconv-prefix=$(BUILD_PREFIX)
+CONFIGURE_ARGS += --with-x
+CONFIGURE_ARGS += --with-mpfr=$(BUILD_PREFIX)
+CONFIGURE_ARGS += --with-gmp=$(BUILD_PREFIX)
+CONFIGURE_ARGS += --enable-java-awt=xlib
+CONFIGURE_ARGS += --enable-libada
+CONFIGURE_ARGS += --enable-libssp
+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
+
 ## 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/amd_merge.mk
 include files/package_def.mk
-include files/amd_merge.mk
 ## include mGar definitions
 include gar/category.mk

Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-31 14:27:55 UTC (rev 4109)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-31 15:22:09 UTC (rev 4110)
@@ -1,4 +1,12 @@
 
+AMD_DEBUG = 1
+
+ifeq ($(AMD_DEBUG),)
+	_DBG=@
+else
+	_DBG=
+endif   
+
 AMD_BASE  = $(WORKROOTDIR)/install-isa-i386-5.10-i386/
 I386_BASE = $(WORKROOTDIR)/install-isa-i386-5.8-i386/
 MPREFIX   = opt/csw/gcc4
@@ -6,44 +14,45 @@
 IPREFIX   = $(I386_BASE)/$(MPREFIX)
 PPREFIX   = $(PKGROOT)/$(MPREFIX)
 
-AMD_MERGE_TARGETS  = x86-merge-dirs
-AMD_MERGE_TARGETS += x86-merge-i386
-AMD_MERGE_TARGETS += x86-merge-amd
-AMD_MERGE_TARGETS += x86-merge-strip
+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)
-	@$(MAKECOOKIE)
+	$(_DBG)$(MAKECOOKIE)
 
-x86-merge-dirs:
-	@(ginstall -d $(PKGROOT))
-	@(ginstall -d $(PPREFIX)/bin/amd64)
-	@(ginstall -d $(PPREFIX)/bin/i386)
-	@$(MAKECOOKIE)
+merge-dirs-amd:
+	$(_DBG)(ginstall -d $(PKGROOT))
+	$(_DBG)(ginstall -d $(PPREFIX)/bin/amd64)
+	$(_DBG)(ginstall -d $(PPREFIX)/bin/i386)
+	$(_DBG)$(MAKECOOKIE)
 
-x86-merge-amd:
-	@(echo "[===== Merging ISA-AMD64 =====]")
-	@(cd $(AMD_BASE); for dir in `gfind . -name "*solaris2\.10*" -type d` ; do \
+merge-amd64-files:
+	$(call _pmod,Merging isa-amd64)
+	@(echo "[===== Merging isa-amd64: ISA=$(ISA) =====]")
+	$(_DBG)(cd $(AMD_BASE); for dir in `gfind . -name "*solaris2\.10*" -type d` ; do \
 		/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)
+	$(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT))
+	$(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw * $(PPREFIX)/bin/amd64)
+	$(_DBG)$(MAKECOOKIE)
 
-x86-merge-i386:
+merge-i386-files:
 	@(echo "[===== Merging ISA-I386 =====]")
-	@(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 $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/bin $(PKGROOT))
-	@(gmv $(PPREFIX)/bin/i386-pc* $(PPREFIX)/bin/i386/)
-	@$(MAKECOOKIE)
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/bin $(PKGROOT))
+	$(_DBG)(gmv -f $(PPREFIX)/bin/i386-pc* $(PPREFIX)/bin/i386/)
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/include $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/info $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/man $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/share $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/lib $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/libexec $(PKGROOT))
+	$(_DBG)$(MAKECOOKIE)
 
-x86-merge-strip:
+merge-strip-amd:
 	@(echo "[===== Stripping Merged Binaries =====]")
-	@(stripbin $(PPREFIX)/bin)
-	@(stripbin $(PPREFIX)/bin/i386)
-	@(stripbin $(PPREFIX)/bin/amd64)
-	@$(MAKECOOKIE)
+	$(_DBG)(stripbin $(PPREFIX)/bin/i386)
+	$(_DBG)(stripbin $(PPREFIX)/bin/amd64)
+	$(_DBG)(stripbin $(PPREFIX)/bin)
+	$(_DBG)$(MAKECOOKIE)
 

Deleted: csw/mgar/pkg/gcc4/trunk/files/configure_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/configure_def.mk	2009-03-31 14:27:55 UTC (rev 4109)
+++ csw/mgar/pkg/gcc4/trunk/files/configure_def.mk	2009-03-31 15:22:09 UTC (rev 4110)
@@ -1,20 +0,0 @@
-## build options 
-CONFIGURE_ARGS  = --prefix=/opt/csw/gcc4
-CONFIGURE_ARGS += --exec-prefix=/opt/csw/gcc4
-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 += --enable-nls
-CONFIGURE_ARGS += --with-included-gettext
-CONFIGURE_ARGS += --with-libiconv-prefix=/opt/csw
-CONFIGURE_ARGS += --with-x
-CONFIGURE_ARGS += --with-mpfr=/opt/csw
-CONFIGURE_ARGS += --with-gmp=/opt/csw
-CONFIGURE_ARGS += --enable-java-awt=xlib
-CONFIGURE_ARGS += --enable-libada
-CONFIGURE_ARGS += --enable-libssp
-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

Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-03-31 14:27:55 UTC (rev 4109)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-03-31 15:22:09 UTC (rev 4110)
@@ -67,33 +67,33 @@
 
 ## Define ISAEXEC
 ISAEXEC_DIRS = $(BUILD_PREFIX)/gcc4/bin
-ISAEXEC_FILES_i386  = /opt/csw/gcc4/bin/gcc
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gcov
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gccbug
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gfortran
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/c++
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/g++
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/cpp
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/addr2name.awk
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gc-analyze
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gcjh
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gjarsigner
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/grmic
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gjavah
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/grmid
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/jcf-dump
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gkeytool
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/grmiregistry
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/jv-convert
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gcj
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gij
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gnative2ascii
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gserialver
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gappletviewer
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gcj-dbtool
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gjar
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gorbd
-ISAEXEC_FILES_i386 += /opt/csw/gcc4/bin/gtnameserv
+ISAEXEC_FILES_i386  = $(BUILD_PREFIX)/gcc4/bin/gcc
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gcov
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gccbug
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gfortran
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/c++
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/g++
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/cpp
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/addr2name.awk
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gc-analyze
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gcjh
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gjarsigner
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/grmic
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gjavah
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/grmid
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/jcf-dump
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gkeytool
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/grmiregistry
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/jv-convert
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gcj
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gij
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gnative2ascii
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gserialver
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gappletviewer
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gcj-dbtool
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gjar
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gorbd
+ISAEXEC_FILES_i386 += $(BUILD_PREFIX)/gcc4/bin/gtnameserv
 
 ## Define the Contents of the Packages
 


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