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

[valholla at users.sourceforge.net]

Revision: 3933
          http://gar.svn.sourceforge.net/gar/?rev=3933&view=rev
Author:   valholla
Date:     2009-03-25 00:47:43 +0000 (Wed, 25 Mar 2009)

Log Message:
-----------
working copy

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk
    csw/mgar/pkg/gcc4/trunk/files/configure_def.mk
    csw/mgar/pkg/gcc4/trunk/files/gar_override.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-24 23:32:20 UTC (rev 3932)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-25 00:47:43 UTC (rev 3933)
@@ -25,6 +25,7 @@
 		pax -rw $$dir $(PKGROOT); done )
 	@(cd $(AMD_BASE); pax -rw $(MPREFIX)/lib/amd64 $(PKGROOT))
 	@(cd $(APREFIX)/bin; pax -rw * $(PPREFIX)/bin/amd64)
+	@(cd $(APREFIX)/bin/amd64; gln *-solaris2.* ../)
 
 x86-merge-i386:
 	@(echo "===> Merging I386")
@@ -35,6 +36,7 @@
 	@(cd $(I386_BASE); pax -rw $(MPREFIX)/lib $(PKGROOT))
 	@(cd $(I386_BASE); pax -rw $(MPREFIX)/libexec $(PKGROOT))
 	@(cd $(IPREFIX)/bin; pax -rw * $(PPREFIX)/bin/i386)
+	@(cd $(APREFIX)/bin/i386; gln *-solaris2.* ../)
 
 x86-merge-strip:
 	@(echo "===> Stripping Merged Binaries")

Modified: csw/mgar/pkg/gcc4/trunk/files/configure_def.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/configure_def.mk	2009-03-24 23:32:20 UTC (rev 3932)
+++ csw/mgar/pkg/gcc4/trunk/files/configure_def.mk	2009-03-25 00:47:43 UTC (rev 3933)
@@ -1,16 +1,6 @@
 
-
 CONFIGURE_ARGS  = --prefix=/opt/csw/gcc4
 CONFIGURE_ARGS += --exec-prefix=/opt/csw/gcc4
-#ifeq ($(shell uname -p),i386)
-#    ifeq ($(shell uname -r),5.10)
-#        CONFIGURE_ARGS += --target=amd64-*-solaris2.10
-#    else
-#        CONFIGURE_ARGS += --target=i?86-*-solaris2.8
-#    endif
-#else
-#    CONFIGURE_ARGS += *-*-solaris2.8
-#endif
 CONFIGURE_ARGS += --with-gnu-as
 CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
 CONFIGURE_ARGS += --without-gnu-ld

Modified: csw/mgar/pkg/gcc4/trunk/files/gar_override.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-03-24 23:32:20 UTC (rev 3932)
+++ csw/mgar/pkg/gcc4/trunk/files/gar_override.mk	2009-03-25 00:47:43 UTC (rev 3933)
@@ -1,7 +1,7 @@
 
-COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)
-WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)
-INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)
+COOKIEDIR = $(COOKIEROOTDIR)/$(MODULATION)-$(GAROSREL)-$(GARCH)
+WORKDIR = $(WORKROOTDIR)/build-$(MODULATION)-$(GAROSREL)-$(GARCH)
+INSTALLISADIR = $(WORKROOTDIR)/install-$(MODULATION)-$(GAROSREL)-$(GARCH)
 PKGROOT = $(abspath $(WORKROOTDIR)/pkgroot-$(GARCH))
 OBJECT_DIR = $(WORKDIR)/objdir
 WORKSRC = $(OBJECT_DIR)
@@ -30,6 +30,34 @@
     BOOT_CFLAGS = -I/opt/csw/include -m32 -march=i386 -g -O2 -pipe
     BOOT_LDFLAGS  = -L/opt/csw/lib -R/opt/csw/lib
 endif
+    ISAEXEC_FILES += $(bindir)/addr2name.awk
+    ISAEXEC_FILES += $(bindir)/gc-analyze
+    ISAEXEC_FILES += $(bindir)/gcjh
+    ISAEXEC_FILES += $(bindir)/gjarsigner
+    ISAEXEC_FILES += $(bindir)/grmic
+    ISAEXEC_FILES += $(bindir)/c++
+    ISAEXEC_FILES += $(bindir)/gcc
+    ISAEXEC_FILES += $(bindir)/gcov
+    ISAEXEC_FILES += $(bindir)/gjavah
+    ISAEXEC_FILES += $(bindir)/grmid
+    ISAEXEC_FILES += $(bindir)/jcf-dump
+    ISAEXEC_FILES += $(bindir)/cpp
+    ISAEXEC_FILES += $(bindir)/gccbug
+    ISAEXEC_FILES += $(bindir)/gfortran
+    ISAEXEC_FILES += $(bindir)/gkeytool
+    ISAEXEC_FILES += $(bindir)/grmiregistry
+    ISAEXEC_FILES += $(bindir)/jv-convert
+    ISAEXEC_FILES += $(bindir)/g++
+    ISAEXEC_FILES += $(bindir)/gcj
+    ISAEXEC_FILES += $(bindir)/gij
+    ISAEXEC_FILES += $(bindir)/gnative2ascii
+    ISAEXEC_FILES += $(bindir)/gserialver
+    ISAEXEC_FILES += $(bindir)/gappletviewer
+    ISAEXEC_FILES += $(bindir)/gcj-dbtool
+    ISAEXEC_FILES += $(bindir)/gjar
+    ISAEXEC_FILES += $(bindir)/gorbd
+    ISAEXEC_FILES += $(bindir)/gtnameserv    
+	    
 endif
 
 export CONFIG_SHELL CFLAGS CPPFLAGS CXXFLAGS

Modified: csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk
===================================================================
--- csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-03-24 23:32:20 UTC (rev 3932)
+++ csw/mgar/pkg/gcc4/trunk/files/pkg_scripts.mk	2009-03-25 00:47:43 UTC (rev 3933)
@@ -1,22 +1,23 @@
 
 
-#pre-fetch:
-	#@(echo "==> Creating Prototype Files from prototype-$(GARCH) files")
-	#@(cd $(FILEDIR) && for file in `ls *-$(GARCH)`; do \
-            #nfile=`echo $$file | gsed 's/-$(GARCH)//'`; \
-            #gcp $$file $$nfile; \
-        #done)
-	#$(DONADA)
 
-#post-checksum:
-	#@(cd $(FILEDIR) && grm *.prototype)
-	#$(DONADA)
+## Create lib links
+post-merge-isa-sparcv8:
+	@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s sparcv9 64)
+	@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . 32)
+	@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . sparcv8)
+	@$(DONADA)
 
+post-merge-isa-i386:
+	@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s amd64 64)
+	@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . 32)
+	@(cd $(PKGROOT)/opt/csw/gcc4/lib && ln -s . i386)
+	@$(DONADA)
+
 ## Create $(OBJECT_DIR) to build in
 post-extract-$(addprefix post-extract-,$(MODULATIONS)):
 	@(echo "==> Creating Object Dir for Building")
 	@( mkdir $(OBJECT_DIR) )
-	#@(gcp $(WORKDIR)/$(GARNAME)-$(GARVERSION)/COPYING $(OBJECT_DIR))
 	$(DONADA)
 
 ## instead of changing to $(WORKSRC) and running configure


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