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

[valholla at users.sourceforge.net]

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

Log Message:
-----------
final checkin -- I hope

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

Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile	2009-03-31 18:36:01 UTC (rev 4115)
+++ csw/mgar/pkg/gcc4/trunk/Makefile	2009-03-31 19:03:15 UTC (rev 4116)
@@ -44,9 +44,6 @@
 CONFIGURE_ARGS += --enable-languages=c,c++,fortran,java,objc
 
 ## For cleanliness I split the Configuration into separate files
-ifeq ($(shell uname -p), i386)
-ISAEXEC_DIRS   = /opt/csw/gcc4/bin
-endif
 include files/amd_merge.mk
 include files/gar_override.mk
 include 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 18:36:01 UTC (rev 4115)
+++ csw/mgar/pkg/gcc4/trunk/files/amd_merge.mk	2009-03-31 19:03:15 UTC (rev 4116)
@@ -1,13 +1,9 @@
-
 ifeq ($(AMD_DEBUG),)
 	_DBG=@
 else
 	_DBG=
 endif   
 
-pre-package:
-	echo $(ISAEXEC_FILES_isa-i386)
-
 AMD_BASE  = $(WORKROOTDIR)/install-isa-i386-5.10-i386/
 I386_BASE = $(WORKROOTDIR)/install-isa-i386-5.8-i386/
 MPREFIX   = opt/csw/gcc4
@@ -56,31 +52,33 @@
 	$(_DBG)(stripbin $(PPREFIX)/bin)
 	$(_DBG)$(MAKECOOKIE)
 
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcc
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcov
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gccbug
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gfortran
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/c++
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/g++
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/cpp
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/addr2name.awk
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gc-analyze
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcjh
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gjarsigner
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/grmic
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gjavah
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/grmid
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/jcf-dump
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gkeytool
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/grmiregistry
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/jv-convert
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcj
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gij
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gnative2ascii
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gserialver
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gappletviewer
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gcj-dbtool
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gjar
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gorbd
-ISAEXEC_FILES_isa-i386 += /opt/csw/gcc4/bin/gtnameserv
-
+ifeq ($(shell uname -p), i386)
+ISAEXEC_DIRS   = /opt/csw/gcc4/bin
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gcc
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gcov
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gccbug
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gfortran
+ISAEXEC_FILES += /opt/csw/gcc4/bin/c++
+ISAEXEC_FILES += /opt/csw/gcc4/bin/g++
+ISAEXEC_FILES += /opt/csw/gcc4/bin/cpp
+ISAEXEC_FILES += /opt/csw/gcc4/bin/addr2name.awk
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gc-analyze
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gcjh
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gjarsigner
+ISAEXEC_FILES += /opt/csw/gcc4/bin/grmic
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gjavah
+ISAEXEC_FILES += /opt/csw/gcc4/bin/grmid
+ISAEXEC_FILES += /opt/csw/gcc4/bin/jcf-dump
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gkeytool
+ISAEXEC_FILES += /opt/csw/gcc4/bin/grmiregistry
+ISAEXEC_FILES += /opt/csw/gcc4/bin/jv-convert
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gij
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gnative2ascii
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gserialver
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gappletviewer
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gcj-dbtool
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gjar
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gorbd
+ISAEXEC_FILES += /opt/csw/gcc4/bin/gtnameserv
+endif


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