~olbohlen/oi-userland.git

parent: 29bb5ee0 | patch | commit | ignore whitespace

7197384 move to parfait 1.0.1

Mike Sullivan

2012-09-14 0c2d4d19ff348dd7c2154faac6e284eec205650f

7197384 move to parfait 1.0.1

6 files modified

	components/cvs/Makefile	4 ●●●●● patch \| view \| raw \| blame \| history
	components/python/python26/Makefile	7 ●●●●● patch \| view \| raw \| blame \| history
	components/python/python27/Makefile	7 ●●●●● patch \| view \| raw \| blame \| history
	components/samba/samba/Makefile	4 ●●●●● patch \| view \| raw \| blame \| history
	make-rules/shared-macros.mk	4 ●●●●● patch \| view \| raw \| blame \| history
	tools/Makefile	1 ●●●●● patch \| view \| raw \| blame \| history

 components/cvs/Makefile

@@ -21,10 +21,6 @@
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#

# we hit parfait bug 12333159 in a case statement, so disable parfait
# until we can move to clang
PARFAIT_BUILD=no

include ../../make-rules/shared-macros.mk

COMPONENT_NAME=        cvs

 components/python/python26/Makefile

@@ -58,12 +58,7 @@
# requirements.
COMPONENT_BUILD_TARGETS = profile-opt
XPROFILE_DIR = $(BUILD_DIR_$(BITS))/.profile
# the non-clang compiler we need to use for now doesn't like
# this flag
#ifneq   ($(strip $(PARFAIT_BUILD)),yes)
PYFLAGS.i386 = -xtarget=opteron
#endif
PYFLAGS.i386 += -xarch=sse2 -xcache=generic
PYFLAGS.i386 = -xtarget=opteron -xarch=sse2 -xcache=generic
PYFLAGS.sparc =
CFLAGS += -xO5 $(PYFLAGS.$(MACH))
LDFLAGS += -xO5 $(PYFLAGS.$(MACH))

 components/python/python27/Makefile

@@ -71,12 +71,7 @@
# requirements.
COMPONENT_BUILD_TARGETS = profile-opt
XPROFILE_DIR = $(BUILD_DIR_$(BITS))/.profile
# the non-clang compiler we need to use for now doesn't like
# this flag
#ifneq   ($(strip $(PARFAIT_BUILD)),yes)
PYFLAGS.i386 = -xtarget=opteron
#endif
PYFLAGS.i386 += -xarch=sse2 -xcache=generic
PYFLAGS.i386 = -xtarget=opteron -xarch=sse2 -xcache=generic
PYFLAGS.sparc =
CFLAGS += -xO5 $(PYFLAGS.$(MACH))
LDFLAGS += -xO5 $(PYFLAGS.$(MACH))

 components/samba/samba/Makefile

@@ -23,10 +23,6 @@
# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
#

# parfait seems to spin when looking at the .bc files, so
# for now disable it.
PARFAIT_BUILD=no

include ../../../make-rules/shared-macros.mk

COMPONENT_NAME=        samba

 make-rules/shared-macros.mk

@@ -219,14 +219,12 @@
SPRO_ROOT =    $(BUILD_TOOLS)/SUNWspro
SPRO_VROOT =    $(SPRO_ROOT)/sunstudio12.1

PARFAIT_ROOT =    $(BUILD_TOOLS)/parfait/parfait-tools-0.5.0.1/
PARFAIT_ROOT =    $(BUILD_TOOLS)/parfait/parfait-tools-1.0.1/
PARFAIT= $(PARFAIT_ROOT)/bin/parfait
export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC
export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc
export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++
# for now
export PARFAIT_CLANG=0

GCC_ROOT =    /usr/sfw


 tools/Makefile

@@ -41,7 +41,6 @@
        echo "export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC" >> parfait/$$i ; \
        echo "export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc" >> parfait/$$i ; \
        echo "export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++" >> parfait/$$i ; \
        echo "export PARFAIT_CLANG="$(PARFAIT_CLANG) >> parfait/$$i ; \
        echo "exec" $(PARFAIT_ROOT)/bin/parfait-$$i '$$*' >> parfait/$$i ; \
        chmod +x parfait/$$i ; \
    done

			@@ -21,10 +21,6 @@
			# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
			#

			# we hit parfait bug 12333159 in a case statement, so disable parfait
			# until we can move to clang
			PARFAIT_BUILD=no

			include ../../make-rules/shared-macros.mk

			COMPONENT_NAME= cvs

			@@ -58,12 +58,7 @@
			# requirements.
			COMPONENT_BUILD_TARGETS = profile-opt
			XPROFILE_DIR = $(BUILD_DIR_$(BITS))/.profile
			# the non-clang compiler we need to use for now doesn't like
			# this flag
			#ifneq ($(strip $(PARFAIT_BUILD)),yes)
			PYFLAGS.i386 = -xtarget=opteron
			#endif
			PYFLAGS.i386 += -xarch=sse2 -xcache=generic
			PYFLAGS.i386 = -xtarget=opteron -xarch=sse2 -xcache=generic
			PYFLAGS.sparc =
			CFLAGS += -xO5 $(PYFLAGS.$(MACH))
			LDFLAGS += -xO5 $(PYFLAGS.$(MACH))

			@@ -71,12 +71,7 @@
			# requirements.
			COMPONENT_BUILD_TARGETS = profile-opt
			XPROFILE_DIR = $(BUILD_DIR_$(BITS))/.profile
			# the non-clang compiler we need to use for now doesn't like
			# this flag
			#ifneq ($(strip $(PARFAIT_BUILD)),yes)
			PYFLAGS.i386 = -xtarget=opteron
			#endif
			PYFLAGS.i386 += -xarch=sse2 -xcache=generic
			PYFLAGS.i386 = -xtarget=opteron -xarch=sse2 -xcache=generic
			PYFLAGS.sparc =
			CFLAGS += -xO5 $(PYFLAGS.$(MACH))
			LDFLAGS += -xO5 $(PYFLAGS.$(MACH))

			@@ -23,10 +23,6 @@
			# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
			#

			# parfait seems to spin when looking at the .bc files, so
			# for now disable it.
			PARFAIT_BUILD=no

			include ../../../make-rules/shared-macros.mk

			COMPONENT_NAME= samba

			@@ -219,14 +219,12 @@
			SPRO_ROOT = $(BUILD_TOOLS)/SUNWspro
			SPRO_VROOT = $(SPRO_ROOT)/sunstudio12.1

			PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-0.5.0.1/
			PARFAIT_ROOT = $(BUILD_TOOLS)/parfait/parfait-tools-1.0.1/
			PARFAIT= $(PARFAIT_ROOT)/bin/parfait
			export PARFAIT_NATIVESUNCC=$(SPRO_VROOT)/bin/cc
			export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC
			export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc
			export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++
			# for now
			export PARFAIT_CLANG=0

			GCC_ROOT = /usr/sfw

			@@ -41,7 +41,6 @@
			echo "export PARFAIT_NATIVESUNCXX=$(SPRO_VROOT)/bin/CC" >> parfait/$$i ; \
			echo "export PARFAIT_NATIVEGCC=$(GCC_ROOT)/bin/gcc" >> parfait/$$i ; \
			echo "export PARFAIT_NATIVEGXX=$(GCC_ROOT)/bin/g++" >> parfait/$$i ; \
			echo "export PARFAIT_CLANG="$(PARFAIT_CLANG) >> parfait/$$i ; \
			echo "exec" $(PARFAIT_ROOT)/bin/parfait-$$i '$$*' >> parfait/$$i ; \
			chmod +x parfait/$$i ; \
			done