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

[valholla at users.sourceforge.net]

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

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

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-03-31 15:27:29 UTC (rev 4111)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-31 15:38:56 UTC (rev 4112)
@@ -1,4 +1,3 @@
-
 AMD_DEBUG = 1
 
 ifeq ($(AMD_DEBUG),)
@@ -29,8 +28,7 @@
 	$(_DBG)$(MAKECOOKIE)
 
 merge-amd64-files:
-	$(call _pmod,Merging isa-amd64)
-	@(echo "[===== Merging isa-amd64: ISA=$(ISA) =====]")
+	@echo "[===== Merging isa-amd64: $(foreach M,$(MODULATORS),$M=$($M)) =====]"
 	$(_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))
@@ -38,7 +36,7 @@
 	$(_DBG)$(MAKECOOKIE)
 
 merge-i386-files:
-	@(echo "[===== Merging ISA-I386 =====]")
+	@echo "[===== Merging isa-i386: $(foreach M,$(MODULATORS),$M=$($M)) =====]"
 	$(_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))
@@ -56,3 +54,31 @@
 	$(_DBG)(stripbin $(PPREFIX)/bin)
 	$(_DBG)$(MAKECOOKIE)
 
+ISAEXEC_DIRS = /opt/csw/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

Modified: csw/mgar/pkg/gcc4/trunk/files/package_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-03-31 15:27:29 UTC (rev 4111)
+++ csw/mgar/pkg/gcc4/trunk/files/package_def.mk	2009-03-31 15:38:56 UTC (rev 4112)
@@ -65,36 +65,6 @@
 REQUIRED_PKGS_CSWgcc4objcrt      = CSWgcc4corert CSWiconv
 REQUIRED_PKGS_CSWgcc4objc        = CSWgcc4objcrt $(COMMON_REQUIRE)
 
-## Define ISAEXEC
-ISAEXEC_DIRS = $(BUILD_PREFIX)/gcc4/bin
-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
 
 ## gcc4gfortran Definitions


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