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.
18615984 userland should move to parfait 1.4 s11-update
authorMike Sullivan <Mike.Sullivan@Oracle.COM>
Mon, 21 Apr 2014 10:36:37 -0700
branchs11-update
changeset 3090 2da1d1d90c07
parent 3089 41e4d4914121
child 3091 e09420595005
18615984 userland should move to parfait 1.4
components/ghostscript/Makefile file | annotate | diff | comparison | revisions
components/imagemagick/Makefile file | annotate | diff | comparison | revisions
components/python/librabbitmq/parfait/amq_private.h.patch file | annotate | diff | comparison | revisions
make-rules/shared-macros.mk file | annotate | diff | comparison | revisions 
--- a/components/ghostscript/Makefile	Mon Apr 21 06:38:11 2014 -0700
+++ b/components/ghostscript/Makefile	Mon Apr 21 10:36:37 2014 -0700
@@ -19,9 +19,13 @@
 #
 # CDDL HEADER END
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
+# parfait seems to spin when looking at the .bc files (18376682), so
+# for now disable it.
+PARFAIT_BUILD=no
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=         ghostscript
--- a/components/imagemagick/Makefile	Mon Apr 21 06:38:11 2014 -0700
+++ b/components/imagemagick/Makefile	Mon Apr 21 10:36:37 2014 -0700
@@ -20,9 +20,12 @@
 #
 
 #
-# Copyright (c) 2011, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
 #
 
+# 14275946 parfait doesn't know about i, _imaginary_i
+PARFAIT_BUILD=no
+
 include ../../make-rules/shared-macros.mk
 
 COMPONENT_NAME=			ImageMagick
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/librabbitmq/parfait/amq_private.h.patch	Mon Apr 21 10:36:37 2014 -0700
@@ -0,0 +1,12 @@
+# parfait bug 17813405 
+--- librabbitmq-1.0.1/clib/librabbitmq/amqp_private.h.orig	Mon Mar 10 13:37:33 2014
++++ librabbitmq-1.0.1/clib/librabbitmq/amqp_private.h	Mon Mar 10 13:37:44 2014
+@@ -51,7 +51,7 @@
+ # elif defined(__GNUC__) && !defined(__GNUC_STDC_INLINE__)
+ #  define _AMQP_INLINE extern __inline
+ # else
+-#  define _AMQP_INLINE __inline
++#  define _AMQP_INLINE static inline
+ # endif
+ #endif
+ 
--- a/make-rules/shared-macros.mk	Mon Apr 21 06:38:11 2014 -0700
+++ b/make-rules/shared-macros.mk	Mon Apr 21 10:36:37 2014 -0700
@@ -227,7 +227,7 @@
 SPRO_ROOT =	$(BUILD_TOOLS)/SUNWspro
 SPRO_VROOT =	$(SPRO_ROOT)/sunstudio12.1
 
-PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.2.0.2
+PARFAIT_ROOT =	$(BUILD_TOOLS)/parfait/parfait-tools-1.4
 PARFAIT_TOOLS=  $(WS_TOOLS)/$(MACH)/parfait
 PARFAIT_TOOLS_GCC3=     $(PARFAIT_TOOLS)/gcc3
 PARFAIT= $(PARFAIT_ROOT)/bin/parfait
upstream/oracle/userland-gate