diff -r 08a4b4ee151d -r 11762b8a16cb transforms/publish-cleanup --- a/transforms/publish-cleanup Wed Jun 27 14:31:20 2012 -0700 +++ b/transforms/publish-cleanup Sat Jun 30 03:06:16 2012 +0100 @@ -18,7 +18,7 @@ # # CDDL HEADER END # -# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. # # @@ -33,3 +33,12 @@ # drop the license actions from the manifests, we aren't going to compare them # drop> +# +# Workaround for http://defect.opensolaris.org/bz/show_bug.cgi?id=19009 +# By default disable gcc45. This can be overriden by setting pkg.gcc3 to false. +# + default pkg.gcc3 true> + add pkg.depend.bypass-generate usr/gcc/4.*> + add pkg.depend.bypass-generate usr/lib(.*)/libgcc_s.so.1> + add pkg.depend.bypass-generate usr/lib(.*)/libstdc\\+\\+.so.*> + delete pkg.gcc3 .*>