--- a/components/mysql-5-6/Makefile Tue May 12 13:01:45 2015 -0700
+++ b/components/mysql-5-6/Makefile Tue May 12 14:31:58 2015 -0700
@@ -21,8 +21,6 @@
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
-export PARFAIT_BUILD=no
-
include ../../make-rules/shared-macros.mk
COMPONENT_NAME = mysql
--- a/components/text-utilities/Makefile Tue May 12 13:01:45 2015 -0700
+++ b/components/text-utilities/Makefile Tue May 12 14:31:58 2015 -0700
@@ -20,6 +20,10 @@
#
# Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved.
#
+
+# parfait fails to compile us (20889777)
+export PARFAIT_BUILD=no
+
include ../../make-rules/shared-macros.mk
COMPONENT_NAME= text-utilities
--- a/make-rules/shared-macros.mk Tue May 12 13:01:45 2015 -0700
+++ b/make-rules/shared-macros.mk Tue May 12 14:31:58 2015 -0700
@@ -248,7 +248,7 @@
SPRO_ROOT = $(BUILD_TOOLS)/SUNWspro
SPRO_VROOT = $(SPRO_ROOT)/sunstudio12.1
-PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.5.1
+PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.6.1
PARFAIT_TOOLS= $(WS_TOOLS)/$(MACH)/parfait
PARFAIT_TOOLS_GCC3= $(PARFAIT_TOOLS)/gcc3
PARFAIT= $(PARFAIT_ROOT)/bin/parfait
@@ -787,7 +787,7 @@
endif
ifeq ($(PARFAIT_BUILD),yes)
# uncomment this line if you need to install Parfait
-#REQUIRED_PACKAGES += developer/parfait/parfait-tools-151
+#REQUIRED_PACKAGES += developer/parfait/parfait-tools-161
endif
REQUIRED_PACKAGES += developer/versioning/mercurial
REQUIRED_PACKAGES += file/gnu-findutils