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

[valholla at users.sourceforge.net]

Revision: 4364
          http://gar.svn.sourceforge.net/gar/?rev=4364&view=rev
Author:   valholla
Date:     2009-04-17 17:41:05 +0000 (Fri, 17 Apr 2009)

Log Message:
-----------
checkin current

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

Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-04-17 16:23:47 UTC (rev 4363)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-04-17 17:41:05 UTC (rev 4364)
@@ -26,23 +26,22 @@
 
 merge-i386-files:
 	@echo "[===== Merging isa-i386 =====]"
-	$(_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)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/bin $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/include $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/info $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/man $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/share $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib $(PKGROOT))
+	$(_DBG)(cd $(I386_BASE); /usr/bin/pax -rw -v $(MPREFIX)/libexec $(PKGROOT))
 	$(_DBG)$(MAKECOOKIE)
 
 merge-amd64-files:
 	@echo "[===== Merging isa-amd64 =====]"
 	$(_DBG)(cd $(AMD_BASE); \
 		for dir in `gfind . -name "*solaris2\.10*" -type d` ; do \
-		/usr/bin/pax -rw $$dir $(PKGROOT); done )
-	$(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT))
-	$(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw * $(PPREFIX)/bin/amd64)
+		/usr/bin/pax -rw -v $$dir $(PKGROOT); done )
+	$(_DBG)(cd $(AMD_BASE); /usr/bin/pax -rw -v $(MPREFIX)/lib/amd64 $(PKGROOT))
+	$(_DBG)(cd $(APREFIX)/bin; /usr/bin/pax -rw -v * $(PPREFIX)/bin/amd64)
 	$(_DBG)$(MAKECOOKIE)
 
 ifeq ($(shell uname -p), i386)

Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-04-17 16:23:47 UTC (rev 4363)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-04-17 17:41:05 UTC (rev 4364)
@@ -73,7 +73,8 @@
 REQUIRED_PKGS_CSWgcc4gfortran    = CSWgcc4core CSWgcc4corert 
 REQUIRED_PKGS_CSWgcc4gfortran   += CSWgcc4gfortranrt $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4javart      = CSWgcc4corert CSWgcc4g++rt $(COMMON_REQUIRE)
-REQUIRED_PKGS_CSWgcc4java        = CSWgcc4core CSWgcc4corert CSWjavart CSWzlib 
+REQUIRED_PKGS_CSWgcc4java        = CSWgcc4core CSWgcc4corert 
+REQUIRED_PKGS_CSWgcc4java       += CSWgcc4javart CSWzlib 
 REQUIRED_PKGS_CSWgcc4java       += CSWgcc4g++ CSWgcc4g++rt $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4objcrt      = CSWgcc4corert $(COMMON_REQUIRE)
 REQUIRED_PKGS_CSWgcc4objc        = CSWgcc4core CSWgcc4corert 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.