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

[wahwah at users.sourceforge.net]

Revision: 15409
          http://gar.svn.sourceforge.net/gar/?rev=15409&view=rev
Author:   wahwah
Date:     2011-08-23 09:05:12 +0000 (Tue, 23 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: libiconv2 dep for all

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-22 20:29:36 UTC (rev 15408)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-23 09:05:12 UTC (rev 15409)
@@ -414,18 +414,27 @@
 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))
+# libiconv deps cropped up relatively late in the porting process. Perhaps
+# they apply to all arch/OS combinations.
+RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4g++ += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4gfortran += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4java += CSWlibiconv2
+RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibiconv2
 
+# Maybe it's unnecessary.
+# # 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.