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

[valholla at users.sourceforge.net]

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

Log Message:
-----------
package checkin

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

Modified: csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-31 03:59:30 UTC (rev 4099)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-31 04:21:44 UTC (rev 4100)
@@ -21,7 +21,7 @@
 	@$(MAKECOOKIE)
 
 x86-merge-amd:
-	@(echo "[===== Merging AMD64 =====]")
+	@(echo "[===== Merging ISA-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,7 +29,7 @@
 	@$(MAKECOOKIE)
 
 x86-merge-i386:
-	@(echo "[===== Merging I386 =====]")
+	@(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))
@@ -37,11 +37,13 @@
 	@(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)
 
 x86-merge-strip:
 	@(echo "[===== Stripping Merged Binaries =====]")
 	@(stripbin $(PPREFIX)/bin)
+	@(stripbin $(PPREFIX)/bin/i386)
 	@(stripbin $(PPREFIX)/bin/amd64)
 	@$(MAKECOOKIE)
 

Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-03-31 03:59:30 UTC (rev 4099)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-03-31 04:21:44 UTC (rev 4100)
@@ -36,6 +36,8 @@
 export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS
 export LDFLAGS BOOT_CFLAGS BOOT_LDFLAGS
 
+FIXCONFIG_DIRS = $(DESTDIR)$(BUILD_PREFIX)/gcc4/lib
+
 CONFIGURE_SCRIPTS = objdir
 TEST_SCRIPTS = skip
 post-configure-modulated: fix-bootflags


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