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

[wahwah at users.sourceforge.net]

Revision: 15376
          http://gar.svn.sourceforge.net/gar/?rev=15376&view=rev
Author:   wahwah
Date:     2011-08-18 22:19:50 +0000 (Thu, 18 Aug 2011)

Log Message:
-----------
pkg/gcc4/branches/bootstrap-4.6: overriding the .a related error tags

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-18 21:37:35 UTC (rev 15375)
+++ csw/mgar/pkg/gcc4/branches/bootstrap-4.6/Makefile	2011-08-18 22:19:50 UTC (rev 15376)
@@ -80,7 +80,7 @@
 CPU_i386_64 = x86-64
 
 CONFIGURE_ARGS_sparc += --with-cpu=$(CPU_$(GARCH)_32)
-CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
+# CONFIGURE_ARGS_i386 += --with-cpu-32=$(CPU_$(GARCH)_32)
 # CONFIGURE_ARGS_i386 += --with-cpu-64=$(CPU_$(GARCH)_64)
 CONFIGURE_ARGS += $(CONFIGURE_ARGS_$(GARCH))
 
@@ -155,6 +155,12 @@
 CHECKPKG_OVERRIDES_CSWgcc4java += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
 CHECKPKG_OVERRIDES_CSWgcc4g++ += file-collision|/opt/csw/gcc4/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
 
+# The .a files are necessary
+CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWgcc4objc += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWgcc4java += discouraged-path-in-pkgmap
+CHECKPKG_OVERRIDES_CSWgcc4gfortran += discouraged-path-in-pkgmap
+
 # From the 'hopeless errors' department:
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libffi.so|CSWgcc3javart|CSWgcc4core
 CHECKPKG_OVERRIDES_CSWgcc4core += file-collision|/opt/csw/lib/libgcc_s.so|CSWgcc3core|CSWgcc4core


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