# HG changeset patch # User Mike Sullivan # Date 1415807228 28800 # Node ID 57f7ad288af9dda351763e0fef4d1fa755e62873 # Parent 3fbdd7a202d66704ab867499508d8e02dc37acdf 20010352 userland should move to parfait 1.5.1 diff -r 3fbdd7a202d6 -r 57f7ad288af9 components/cmake/Makefile --- a/components/cmake/Makefile Tue Nov 11 14:04:02 2014 -0800 +++ b/components/cmake/Makefile Wed Nov 12 07:47:08 2014 -0800 @@ -19,13 +19,9 @@ # 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 hang on libcmsysTestDynload.so.bc, so for -# now we have to disable it. -export PARFAIT_BUILD=no - include ../../make-rules/shared-macros.mk COMPONENT_NAME= cmake @@ -53,9 +49,6 @@ # as CONFIGURE_OPTIONS; otherwise the correct compilers are not used CONFIGURE_ENV += CC="$(CC)" CONFIGURE_ENV += CXX="$(CXX)" -ifeq ($(strip $(PARFAIT_BUILD)),yes) -CONFIGURE_ENV += CXXFLAGS="-library=stdcxx4" -endif CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)" CONFIGURE_ENV += MAKE="$(GMAKE)" diff -r 3fbdd7a202d6 -r 57f7ad288af9 components/ghostscript/Makefile --- a/components/ghostscript/Makefile Tue Nov 11 14:04:02 2014 -0800 +++ b/components/ghostscript/Makefile Wed Nov 12 07:47:08 2014 -0800 @@ -22,12 +22,13 @@ # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # -# parfait seems to spin when looking at the .bc files (18376682), so +# 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 + COMPONENT_NAME= ghostscript COMPONENT_VERSION= 9.00 COMPONENT_PROJECT_URL= http://ghostscript.com/ diff -r 3fbdd7a202d6 -r 57f7ad288af9 components/imagemagick/Makefile --- a/components/imagemagick/Makefile Tue Nov 11 14:04:02 2014 -0800 +++ b/components/imagemagick/Makefile Wed Nov 12 07:47:08 2014 -0800 @@ -23,9 +23,6 @@ # 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 diff -r 3fbdd7a202d6 -r 57f7ad288af9 components/mpc/parfait/configure.patch --- a/components/mpc/parfait/configure.patch Tue Nov 11 14:04:02 2014 -0800 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,11 +0,0 @@ ---- mpc-0.9/configure.orig Wed Jan 25 11:05:39 2012 -+++ mpc-0.9/configure Wed Jan 25 11:05:46 2012 -@@ -10989,7 +10989,7 @@ - - fi - --for ac_header in complex.h locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h -+for ac_header in locale.h inttypes.h stdint.h limits.h unistd.h sys/time.h - do : - as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` - ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" diff -r 3fbdd7a202d6 -r 57f7ad288af9 components/net-snmp/Makefile --- a/components/net-snmp/Makefile Tue Nov 11 14:04:02 2014 -0800 +++ b/components/net-snmp/Makefile Wed Nov 12 07:47:08 2014 -0800 @@ -21,9 +21,6 @@ # Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved. # -# parfait is upset about some inline assembly -export PARFAIT_BUILD=no - include ../../make-rules/shared-macros.mk PATH=$(SPRO_VROOT)/bin:/usr/gnu/bin:/usr/bin diff -r 3fbdd7a202d6 -r 57f7ad288af9 components/openssl/openssl-1.0.1-fips-140/Makefile --- a/components/openssl/openssl-1.0.1-fips-140/Makefile Tue Nov 11 14:04:02 2014 -0800 +++ b/components/openssl/openssl-1.0.1-fips-140/Makefile Wed Nov 12 07:47:08 2014 -0800 @@ -25,6 +25,9 @@ include ../../../make-rules/shared-macros.mk PATH=$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin +ifeq ($(strip $(PARFAIT_BUILD)),yes) +PATH=$(PARFAIT_TOOLS):$(SPRO_VROOT)/bin:/usr/bin:/usr/gnu/bin:/usr/perl5/bin +endif COMPONENT_NAME = openssl-fips-140 # Note that this is the OpenSSL version that is used to build FIPS-140 certified @@ -129,9 +132,6 @@ ( [ $(BITS) -eq 32 ] && $(GPATCH) -p1 $(@D)/crypto/opensslconf.h \ patches-post-config/opensslconf.patch; cd $(@D); $(MAKE) depend; ) -# Enable ASLR for this component -ASLR_MODE = $(ASLR_ENABLE) - # We must make sure that openssl-fips component is built before this 1.0.1 # component since in order to build FIPS-140 certified libraries, the canister # is needed. Note that we must unset BITS that would override the same variable diff -r 3fbdd7a202d6 -r 57f7ad288af9 make-rules/shared-macros.mk --- a/make-rules/shared-macros.mk Tue Nov 11 14:04:02 2014 -0800 +++ b/make-rules/shared-macros.mk Wed Nov 12 07:47:08 2014 -0800 @@ -227,7 +227,7 @@ SPRO_ROOT = $(BUILD_TOOLS)/SUNWspro SPRO_VROOT = $(SPRO_ROOT)/sunstudio12.1 -PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.4 +PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.5.1 PARFAIT_TOOLS= $(WS_TOOLS)/$(MACH)/parfait PARFAIT_TOOLS_GCC3= $(PARFAIT_TOOLS)/gcc3 PARFAIT= $(PARFAIT_ROOT)/bin/parfait diff -r 3fbdd7a202d6 -r 57f7ad288af9 tools/Makefile --- a/tools/Makefile Tue Nov 11 14:04:02 2014 -0800 +++ b/tools/Makefile Wed Nov 12 07:47:08 2014 -0800 @@ -30,9 +30,6 @@ # with the correct compiler variables from the common makefiles because # some things reset the environment which causes lovely infinite # loops -# -# currently, parfait doesn't support gcc4.7+, so we force the use -# of gcc3 in both sets of wrappers. links: @$(MKDIR) $(PARFAIT_TOOLS) @for i in cc CC gcc g++ ld ; do \ @@ -41,8 +38,8 @@ 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=$(GCC3_ROOT)/bin/gcc" >> $(PARFAIT_TOOLS)/$$i ; \ - echo "export PARFAIT_NATIVEGXX=$(GCC3_ROOT)/bin/g++" >> $(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 '$$*' >> $(PARFAIT_TOOLS)/$$i ; \ chmod +x $(PARFAIT_TOOLS)/$$i ; \