Mercurial Mercurial > upstream > oracle > userland-gate / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
23018794 userland should move to parfait 1.8
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Tue, 29 Mar 2016 14:45:36 -0700
changeset 5674 a5c5f8ac5f4b
parent 5673 03a73b3209f6
child 5675 46773d0b4805
23018794 userland should move to parfait 1.8
components/ghostscript/Makefile file | annotate | diff | comparison | revisions
components/ksh93/Makefile file | annotate | diff | comparison | revisions
components/r/Makefile file | annotate | diff | comparison | revisions
components/samba/Makefile file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- a/components/ghostscript/Makefile	Tue Mar 29 14:05:28 2016 -0700
+++ b/components/ghostscript/Makefile	Tue Mar 29 14:45:36 2016 -0700
@@ -19,13 +19,9 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
+# 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.
-PARFAIT_BUILD=no
-
 include ../../make-rules/shared-macros.mk
 
 
--- a/components/ksh93/Makefile	Tue Mar 29 14:05:28 2016 -0700
+++ b/components/ksh93/Makefile	Tue Mar 29 14:45:36 2016 -0700
@@ -21,9 +21,6 @@
 # Copyright (c) 2012, 2016, Oracle and/or its affiliates. All rights reserved.
 #
 
-# the parfait build fails strangely (22276647)
-export PARFAIT_BUILD=no
-
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_BUGDB=    utility/ksh93
--- a/components/r/Makefile	Tue Mar 29 14:05:28 2016 -0700
+++ b/components/r/Makefile	Tue Mar 29 14:45:36 2016 -0700
@@ -66,6 +66,10 @@
 CC =		cc
 CXX =		CC
 F95 =		f95
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+export PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin
+endif
+
 
 CONFIGURE_ENV += F77="$(F95) $(CC_BITS)"
 CONFIGURE_ENV += FC="$(F95) $(CC_BITS)"
--- a/components/samba/Makefile	Tue Mar 29 14:05:28 2016 -0700
+++ b/components/samba/Makefile	Tue Mar 29 14:45:36 2016 -0700
@@ -37,9 +37,6 @@
 override studio_OPT = -xO1
 endif
 
-# parfait seems to spin on us
-export PARFAIT_BUILD=no
-
 COMPONENT_NAME=		samba
 COMPONENT_VERSION=	4.1.22
 TPNO=			26541
--- a/make-rules/shared-macros.mk	Tue Mar 29 14:05:28 2016 -0700
+++ b/make-rules/shared-macros.mk	Tue Mar 29 14:45:36 2016 -0700
@@ -437,7 +437,7 @@
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
 SPRO_VROOT =	$(SPRO_ROOT)/solarisstudio12.4
 
-PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.7.1
+PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.8
 PARFAIT_TOOLS=	$(WS_TOOLS)/$(MACH)/parfait
 PARFAIT= $(PARFAIT_ROOT)/bin/parfait
 export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
upstream/oracle/userland-gate