--- a/components/desktop/flac/Makefile Thu Oct 13 14:47:30 2016 -0700
+++ b/components/desktop/flac/Makefile Thu Oct 13 17:26:39 2016 -0700
@@ -21,6 +21,9 @@
# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
#
+# parfait is a bit unhappy (24796395)
+export PARFAIT_BUILD=no
+
BUILD_BITS= 64_and_32
# Upstream requires gcc flags that Studio doesn't support
COMPILER= gcc
--- a/components/desktop/libvpx/Makefile Thu Oct 13 14:47:30 2016 -0700
+++ b/components/desktop/libvpx/Makefile Thu Oct 13 17:26:39 2016 -0700
@@ -23,6 +23,9 @@
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
+# parfait is a bit unhappy (24796432)
+export PARFAIT_BUILD=no
+
# Prefer 32-bit over 64-bit for now.
BUILD_BITS=32_and_64
# For now, all things built for C++11 require gcc.
--- a/components/desktop/mozjs-24/Makefile Thu Oct 13 14:47:30 2016 -0700
+++ b/components/desktop/mozjs-24/Makefile Thu Oct 13 17:26:39 2016 -0700
@@ -21,6 +21,9 @@
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
+# parfait is a bit unhappy (24796622)
+export PARFAIT_BUILD=no
+
BUILD_BITS = 32_and_64
COMPILER = gcc
include ../../../make-rules/shared-macros.mk
--- a/components/desktop/polkit/Makefile Thu Oct 13 14:47:30 2016 -0700
+++ b/components/desktop/polkit/Makefile Thu Oct 13 17:26:39 2016 -0700
@@ -21,6 +21,9 @@
# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
#
+# parfait is a bit unhappy (24796481)
+export PARFAIT_BUILD=no
+
BUILD_BITS = 64_and_32
# Also, all components using gobject-introspection must be built with gcc as
# gobject-introspection does not produce correct results when using Studio.
--- a/components/desktop/webkitgtk4/Makefile Thu Oct 13 14:47:30 2016 -0700
+++ b/components/desktop/webkitgtk4/Makefile Thu Oct 13 17:26:39 2016 -0700
@@ -23,6 +23,9 @@
# Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
#
+# parfait is a bit unhappy (24796572)
+export PARFAIT_BUILD=no
+
BUILD_BITS= 64
# For now, all things built for C++11 require gcc; the cmake files for this
# project already specify the required -std.
--- a/components/gcc3/Makefile Thu Oct 13 14:47:30 2016 -0700
+++ b/components/gcc3/Makefile Thu Oct 13 17:26:39 2016 -0700
@@ -23,6 +23,9 @@
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
BUILD_BITS= 32
+
+export PARFAIT_BUILD=no
+
# Build gcc with gcc
COMPILER= gcc
include ../../make-rules/shared-macros.mk
--- a/components/ghostscript/Makefile Thu Oct 13 14:47:30 2016 -0700
+++ b/components/ghostscript/Makefile Thu Oct 13 17:26:39 2016 -0700
@@ -23,6 +23,10 @@
#
# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
#
+# parfait seems to spin when looking at the .bc files (13704877), so
+# for now disable it.
+export PARFAIT_BUILD=no
+
# Prefer 32-bit due to ghostcript's hybrid build system.
BUILD_BITS= 32_and_64
include ../../make-rules/shared-macros.mk
--- a/make-rules/shared-macros.mk Thu Oct 13 14:47:30 2016 -0700
+++ b/make-rules/shared-macros.mk Thu Oct 13 17:26:39 2016 -0700
@@ -460,7 +460,7 @@
SPRO_ROOT ?= $(BUILD_TOOLS)/SUNWspro
SPRO_VROOT ?= $(SPRO_ROOT)/solarisstudio12.4
-PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.8.0.1
+PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.9.0
PARFAIT_TOOLS= $(WS_TOOLS)/$(MACH)/parfait
PARFAIT= $(PARFAIT_ROOT)/bin/parfait
export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
--- a/tools/Makefile Thu Oct 13 14:47:30 2016 -0700
+++ b/tools/Makefile Thu Oct 13 17:26:39 2016 -0700
@@ -34,7 +34,7 @@
# loops
links:
@$(MKDIR) $(PARFAIT_TOOLS)
- @for i in cc CC gcc g++ ld ; do \
+ @for i in cc CC g++ ld ; do \
$(RM) $(PARFAIT_TOOLS)/$$i ; \
echo "#!/bin/ksh" > $(PARFAIT_TOOLS)/$$i ; \
echo "IFS=" >> $(PARFAIT_TOOLS)/$$i ; \
@@ -46,6 +46,18 @@
echo "exec" $(PARFAIT_ROOT)/$(MACH)/parfait-$$i '$$*' >> $(PARFAIT_TOOLS)/$$i ; \
chmod +x $(PARFAIT_TOOLS)/$$i ; \
done
+ @for i in gcc ; do \
+ $(RM) $(PARFAIT_TOOLS)/$$i ; \
+ echo "#!/bin/ksh" > $(PARFAIT_TOOLS)/$$i ; \
+ echo "IFS=" >> $(PARFAIT_TOOLS)/$$i ; \
+ echo "export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc" >> $(PARFAIT_TOOLS)/$$i ; \
+ echo "export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC" >> $(PARFAIT_TOOLS)/$$i ; \
+ echo "export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc" >> $(PARFAIT_TOOLS)/$$i ; \
+ echo "export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++" >> $(PARFAIT_TOOLS)/$$i ; \
+ echo "export PARFAIT_NATIVELD=/usr/bin/ld" >> $(PARFAIT_TOOLS)/$$i ; \
+ echo "exec" $(PARFAIT_ROOT)/$(MACH)/parfait-$$i -D_Noreturn= '$$*' >> $(PARFAIT_TOOLS)/$$i ; \
+ chmod +x $(PARFAIT_TOOLS)/$$i ; \
+ done
pkglint:
@rm -f pkglint