Revision: 15439
http://gar.svn.sourceforge.net/gar/?rev=15439&view=rev
Author: wahwah
Date: 2011-08-25 21:59:34 +0000 (Thu, 25 Aug 2011)
Log Message:
-----------
pkg/gcc4/branches/opt-csw-prefix: Overrides for non-critical issues
Modified Paths:
--------------
csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
Modified: csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile
===================================================================
--- csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile 2011-08-25 14:40:34 UTC
(rev 15438)
+++ csw/mgar/pkg/gcc4/branches/opt-csw-prefix/Makefile 2011-08-25 21:59:34 UTC
(rev 15439)
@@ -169,7 +169,15 @@
# Due to complex regular expressions
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
+CHECKPKG_OVERRIDES_CSWgcc4java +=
file-collision|/opt/csw/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+CHECKPKG_OVERRIDES_CSWgcc4g++ +=
file-collision|/opt/csw/include/c++/$(VERSION)/sun/awt/CausedFocusEvent.h|CSWgcc4g++|CSWgcc4java
+# Only man pages, so not a big problem. Alternatives could be used, but it
+# requires rebuilding libffi.
+CHECKPKG_OVERRIDES_CSWgcc4core +=
file-collision|/opt/csw/share/man/man3/ffi_call.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core +=
file-collision|/opt/csw/share/man/man3/ffi.3|CSWgcc4core|CSWlibffi-dev
+CHECKPKG_OVERRIDES_CSWgcc4core +=
file-collision|/opt/csw/share/man/man3/ffi_prep_cif.3|CSWgcc4core|CSWlibffi-dev
+
# The .a files are necessary
CHECKPKG_OVERRIDES_CSWgcc4core += discouraged-path-in-pkgmap
CHECKPKG_OVERRIDES_CSWgcc4objc += discouraged-path-in-pkgmap
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
