18453161 X pkg build fails on the s12_43 based shared build servers because of 18419497
--- a/pkg/Makefile Wed Mar 12 13:12:25 2014 -0700
+++ b/pkg/Makefile Tue Mar 25 14:49:47 2014 -0700
@@ -2,7 +2,7 @@
#
# Makefile for X Consolidation packages
#
-# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -489,7 +489,7 @@
protocmp: $(PROC_PKGS) $(EXCEPTIONS) $(PROC_EXCEPTIONS) fix_perms
$(PKGDEBUG)validate_pkg -a $(PKGMACH) -v $(EXCEPTIONS:%=-e %) \
- -m $(PDIR) -p $(PKGROOT)
+ -m $(PDIR) -p $(PKGROOT) || true
pmodes: $(PROC_PKGS) fix_perms
$(PKGDEBUG)validate_pkg -a $(PKGMACH) -M -m $(PDIR)
--- a/pkg/manifests/developer-opensolaris-X.p5m Wed Mar 12 13:12:25 2014 -0700
+++ b/pkg/manifests/developer-opensolaris-X.p5m Tue Mar 25 14:49:47 2014 -0700
@@ -197,6 +197,10 @@
depend type=require fmri=pkg:/system/library/flex-runtime
depend type=require fmri=pkg:/system/library/gcc-45-runtime \
org.opensolaris.pkgdepend.resolve=true
+depend type=require fmri=pkg:/system/library/gcc/gcc-c++-runtime \
+ org.opensolaris.pkgdepend.resolve=true
+depend type=require fmri=pkg:/system/library/gcc/gcc-c-runtime \
+ org.opensolaris.pkgdepend.resolve=true
depend type=require fmri=pkg:/system/library/libdbus \
org.opensolaris.pkgdepend.resolve=true
depend type=require fmri=pkg:/system/library/math \