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

[dmichelsen at users.sourceforge.net]

Revision: 22091
          http://gar.svn.sourceforge.net/gar/?rev=22091&view=rev
Author:   dmichelsen
Date:     2013-10-02 08:52:08 +0000 (Wed, 02 Oct 2013)
Log Message:
-----------
gcc4/trunk: Readd libiconv

Modified Paths:
--------------
    csw/mgar/pkg/gcc4/trunk/Makefile

Modified: csw/mgar/pkg/gcc4/trunk/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/trunk/Makefile	2013-10-02 08:22:33 UTC (rev 22090)
+++ csw/mgar/pkg/gcc4/trunk/Makefile	2013-10-02 08:52:08 UTC (rev 22091)
@@ -47,6 +47,7 @@
 BUILD_DEP_PKGS += CSWlibmpfr-dev
 BUILD_DEP_PKGS += CSWlibppl-dev
 BUILD_DEP_PKGS += CSWlibz-dev
+BUILD_DEP_PKGS += CSWlibiconv-dev
 
 # Could be used to break out of the /opt/csw/$(PKG_VERSION_TOKEN) prefix
 PROGRAM_SUFFIX = -$(BASE_VERSION)
@@ -125,6 +126,7 @@
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWcoreutils
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWggrep
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWgsed
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)core += CSWlibiconv2
 
 ALTERNATIVES_$(PKG_BASENAME)core += $(PKG_VERSION_TOKEN)core
 ALTERNATIVE_$(PKG_VERSION_TOKEN)core += $(bindir)/cpp gcc_core $(bindir)/cpp$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO)
@@ -154,7 +156,6 @@
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)core += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)objc += discouraged-path-in-pkgmap
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += discouraged-path-in-pkgmap
-
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)gfortran += discouraged-path-in-pkgmap
 
 # Some static libraries are required to build binaries with gcc, for example
@@ -211,7 +212,6 @@
 SPKG_DESC_CSWlibgomp1 += $(DESCRIPTION), libgomp.so.1
 RUNTIME_DEP_PKGS_CSWlibgomp1 += CSWlibgcc-s1
 
-
 PACKAGES += CSWlibobjc$(LIBOBJC)
 CATALOGNAME_CSWlibobjc$(LIBOBJC) = libobjc$(LIBOBJC)
 PKGFILES_CSWlibobjc$(LIBOBJC) += $(call baseisadirs,$(libdir),libobjc\.so\.$(LIBOBJC)(\.\d+)*)
@@ -285,6 +285,7 @@
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibstdc++$(LIBSTDCXX_VERSION)
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibz1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += CSWlibiconv2
 
 # The C++ compiler needs the C compiler.
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)g++ += $(PKG_BASENAME)core
@@ -310,6 +311,7 @@
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpc2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibz1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)gfortran += CSWlibiconv2
 
 ALTERNATIVES_$(PKG_BASENAME)gfortran += gfortran
 ALTERNATIVE_gfortran += $(bindir)/gfortran gcc_gfortran $(bindir)/gfortran$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO)
@@ -325,6 +327,7 @@
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpc2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibz1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)java += CSWlibiconv2
 CHECKPKG_OVERRIDES_$(PKG_BASENAME)java += surplus-dependency|CSWecj
 
 PKGFILES_$(PKG_BASENAME)java  = $(foreach F,$(JAVA_BINARIES),$(bindir)/$(F)$(PROGRAM_SUFFIX))
@@ -402,6 +405,7 @@
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc$(LIBOBJC)
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibobjc-gc$(LIBOBJC)
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibz1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)objc += CSWlibiconv2
 
 PACKAGES += $(PKG_BASENAME)ada
 SPKG_DESC_$(PKG_BASENAME)ada       = GCC Ada compiler (GNAT)
@@ -423,6 +427,7 @@
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpc2
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibmpfr4
 RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibz1
+RUNTIME_DEP_PKGS_$(PKG_BASENAME)ada += CSWlibiconv2
 
 ALTERNATIVES_$(PKG_BASENAME)ada += $(PKG_VERSION_TOKEN)ada
 ALTERNATIVE_$(PKG_VERSION_TOKEN)ada += $(bindir)/gnat      gcc_ada $(bindir)/gnat$(PROGRAM_SUFFIX) $(ALTERNATIVES_PRIO)

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