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

valholla at users.sourceforge.net valholla at users.sourceforge.net
Tue Mar 31 05:59:30 CEST 2009


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

Log Message:
-----------
checkin recent

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/files/amd_merge.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/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-31 03:44:37 UTC (rev 4098)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-31 03:59:30 UTC (rev 4099)
@@ -21,7 +21,7 @@
 	@$(MAKECOOKIE)
 
 x86-merge-amd:
-	@(echo "===> Merging AMD64")
+	@(echo "[===== Merging AMD64 =====]")
 	@(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))
@@ -29,19 +29,19 @@
 	@$(MAKECOOKIE)
 
 x86-merge-i386:
-	@(echo "===> Merging I386")
+	@(echo "[===== Merging 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 $(IPREFIX)/bin; /usr/bin/pax -rw * $(PPREFIX)/bin/i386)
+	@(cd $(I386_BASE); /usr/bin/pax -rw $(MPREFIX)/bin $(PKGROOT))
 	@$(MAKECOOKIE)
 
 x86-merge-strip:
-	@(echo "===> Stripping Merged Binaries")
+	@(echo "[===== Stripping Merged Binaries =====]")
+	@(stripbin $(PPREFIX)/bin)
 	@(stripbin $(PPREFIX)/bin/amd64)
-	@(stripbin $(PPREFIX)/bin/i386)
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-03-31 03:44:37 UTC (rev 4098)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-03-31 03:59:30 UTC (rev 4099)
@@ -66,33 +66,34 @@
 REQUIRED_PKGS_CSWgcc4objc        = CSWgcc4objcrt $(COMMON_REQUIRE)
 
 ## Define ISAEXEC
-ISAEXEC_FILES_CSWgcc4core_i386      = /opt/csw/gcc4/bin/gcc
-ISAEXEC_FILES_CSWgcc4core_i386     += /opt/csw/gcc4/bin/gcov
-ISAEXEC_FILES_CSWgcc4core_i386     += /opt/csw/gcc4/bin/gccbug
-ISAEXEC_FILES_CSWgcc4gfortran_i386  = /opt/csw/gcc4/bin/gfortran
-ISAEXEC_FILES_CSWgcc4g++_i386       = /opt/csw/gcc4/bin/c++
-ISAEXEC_FILES_CSWgcc4g++_i386      += /opt/csw/gcc4/bin/g++
-ISAEXEC_FILES_CSWgcc4g++_i386      += /opt/csw/gcc4/bin/cpp
-ISAEXEC_FILES_CSWgcc4java_i386      = /opt/csw/gcc4/bin/addr2name.awk
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gc-analyze
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gcjh
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gjarsigner
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/grmic
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gjavah
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/grmid
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/jcf-dump
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gkeytool
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/grmiregistry
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/jv-convert
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gcj
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gij
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gnative2ascii
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gserialver
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gappletviewer
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gcj-dbtool
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gjar
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gorbd
-ISAEXEC_FILES_CSWgcc4java_i386     += /opt/csw/gcc4/bin/gtnameserv
+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
 
 ## Define the Contents of the Packages
 

Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-03-31 03:44:37 UTC (rev 4098)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-03-31 03:59:30 UTC (rev 4099)
@@ -1,4 +1,6 @@
 
+DEBUG_PACKAGING = 1
+
 post-patch-modulated:
 	@(echo "==> Running autoheader and autoconf")
 	@(cd $(PATCHDIR)/gcc && autoheader)


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