[csw-devel] SF.net SVN: gar:[15392] csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

[wahwah at users.sourceforge.net]

Revision: 15392
          http://gar.svn.sourceforge.net/gar/?rev=15392&view=rev
Author:   wahwah
Date:     2011-08-21 07:03:53 +0000 (Sun, 21 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: iconv is needed for i386 5.10, hardlink targets adjusted too

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile

Modified: csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 06:14:57 UTC (rev 15391)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-21 07:03:53 UTC (rev 15392)
@@ -297,8 +297,8 @@
 PACKAGES += CSWgcc4g++
 CATALOGNAME_CSWgcc4g++ = gcc4g++
 SPKG_DESC_CSWgcc4g++ = GNU C++ Compiler
-PKGFILES_CSWgcc4g++  = $(bindir)/g\+\+
-PKGFILES_CSWgcc4g++ += $(bindir)/c\+\+
+PKGFILES_CSWgcc4g++  = $(bindir)/[cg]\+\+
+PKGFILES_CSWgcc4g++ += $(bindir)/\w+-pc-solaris[\d\.]+-[cg]\+\+
 PKGFILES_CSWgcc4g++ += $(libexecdir)/.*cc1plus
 PKGFILES_CSWgcc4g++ += $(libdir)/.*libstdc.*a
 PKGFILES_CSWgcc4g++ += $(call baseisadirs,$(libdir),libstdc\+\+\.so)
@@ -326,6 +326,7 @@
 RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibz1
 PKGFILES_CSWgcc4gfortran  = $(bindir)/gfortran
 PKGFILES_CSWgcc4gfortran += $(bindir)/sparc-sun-solaris2.10-gfortran
+PKGFILES_CSWgcc4gfortran += $(bindir)/i386-pc-solaris2.10-gfortran
 PKGFILES_CSWgcc4gfortran += $(libdir)/.*libgfortran.*a
 PKGFILES_CSWgcc4gfortran += $(libexecdir)/.*f951
 PKGFILES_CSWgcc4gfortran += $(mandir)/.*gfortran.1
@@ -412,6 +413,18 @@
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpfr4
 RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibgmp10
 
+# Solaris 10 on i386 specific:
+RUNTIME_DEP_PKGS_CSWgcc4core_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4g++_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4gfortran_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4objc_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4java_i386_5.10 += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4core += $(RUNTIME_DEP_PKGS_CSWgcc4core_$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWgcc4g++ += $(RUNTIME_DEP_PKGS_CSWgcc4g++_$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += $(RUNTIME_DEP_PKGS_CSWgcc4gfortran_$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWgcc4objc += $(RUNTIME_DEP_PKGS_CSWgcc4objc_$(GARCH)_$(GAROSREL))
+RUNTIME_DEP_PKGS_CSWgcc4java += $(RUNTIME_DEP_PKGS_CSWgcc4java_$(GARCH)_$(GAROSREL))
+
 PACKAGES += $(PACKAGES_$(GARCH))
 
 include files/scripts.mk


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