Revision: 15422
http://gar.svn.sourceforge.net/gar/?rev=15422&view=rev
Author: wahwah
Date: 2011-08-24 08:10:14 +0000 (Wed, 24 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/gccgo: merging bootstrap-4.6
Modified Paths:
--------------
csw/mgar/pkg/gcc4/branches/gccgo/Makefile
Removed Paths:
-------------
csw/mgar/pkg/gcc4/branches/gccgo/files/test-results/
Property Changed:
----------------
csw/mgar/pkg/gcc4/branches/gccgo/
Property changes on: csw/mgar/pkg/gcc4/branches/gccgo
___________________________________________________________________
Added: svn:mergeinfo
+ /csw/mgar/pkg/gcc4/branches/bootstrap-4.6:15395-15421
Modified: csw/mgar/pkg/gcc4/branches/gccgo/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/gccgo/Makefile 2011-08-24 07:58:07 UTC (rev
15421)
+++ csw/mgar/pkg/gcc4/branches/gccgo/Makefile 2011-08-24 08:10:14 UTC (rev
15422)
@@ -44,8 +44,10 @@
# Could be used to break out of the /opt/csw/gcc4 prefix
# CONFIGURE_ARGS += --program-prefix=gcc4-
-CONFIGURE_ARGS += --with-pkgversion=OpenCSW
-CONFIGURE_ARGS += $(DIRPATHS)
+CONFIGURE_ARGS += --prefix=$(prefix)
+CONFIGURE_ARGS += --libdir=$(libdir)
+# The theory is that DIRPATHS confuse the installer, e.g. includedir
+# CONFIGURE_ARGS += --includedir=$(prefix)/include
CONFIGURE_ARGS += --exec-prefix=$(BUILD_PREFIX)/gcc4
CONFIGURE_ARGS += --with-gnu-as
CONFIGURE_ARGS += --with-as=/opt/csw/bin/gas
@@ -148,7 +150,6 @@
RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibssp0
RUNTIME_DEP_PKGS_CSWgcc4core += CSWlibz1
RUNTIME_DEP_PKGS_CSWgcc4core += CSWpython
-RUNTIME_DEP_PKGS_CSWgcc4core += CSWbinutils
RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibmpc2
RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc-gc3
RUNTIME_DEP_PKGS_CSWgcc4objc += CSWlibobjc3
@@ -413,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.
_______________________________________________
devel mailing list
devel@lists.opencsw.org
https://lists.opencsw.org/mailman/listinfo/devel
