17702953 Cairo bindings for Python 3
authorAlan Coopersmith <Alan.Coopersmith@Oracle.COM>
Wed, 21 Sep 2016 19:51:41 -0700
changeset 6956 35dd98776277
parent 6955 c48eb02e201d
child 6957 ff86c93b1c69
17702953 Cairo bindings for Python 3
components/python/py2cairo/py2cairo-27.p5m
components/python/py2cairo/py2cairo-PYVER.p5m
components/python/pycairo/Makefile
components/python/pycairo/patches/01-waf-python-config.patch
components/python/pycairo/patches/02-waf-pickle.patch
components/python/pycairo/pycairo-GENFRAG.p5m
components/python/pycairo/pycairo-PYVER.p5m
make-rules/waf.mk
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/py2cairo/py2cairo-27.p5m	Wed Sep 21 19:51:41 2016 -0700
@@ -0,0 +1,50 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+# This file intentionally hardcodes Python 2.7 instead of using the PYVER
+# subsititutions to avoid triggering the auto-generation of a generic
+# library/python/pycairo in this component, since that's being done in
+# ../pycairo instead to cover the python 3.x versions correctly.
+
+set name=pkg.fmri \
+    value=pkg:/library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary value="Python 2.7 bindings for the Cairo graphics library"
+set name=com.oracle.info.description value="Python 2.7 bindings for Cairo"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/371
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+file path=usr/include/pycairo/pycairo.h
+link path=usr/include/pycairo27 target=pycairo
+file path=usr/lib/pkgconfig/pycairo.pc
+link path=usr/lib/pkgconfig/pycairo27.pc target=pycairo.pc
+file path=usr/lib/python2.7/vendor-packages/cairo/64/_cairo.so
+file path=usr/lib/python2.7/vendor-packages/cairo/__init__.py
+file path=usr/lib/python2.7/vendor-packages/cairo/_cairo.so
+license COPYING license=LGPL-2.1,MPL-1.1
+license COPYING-MPL-1.1 license=MPL-1.1
--- a/components/python/py2cairo/py2cairo-PYVER.p5m	Wed Sep 21 19:51:33 2016 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,48 +0,0 @@
-#
-# CDDL HEADER START
-#
-# The contents of this file are subject to the terms of the
-# Common Development and Distribution License (the "License").
-# You may not use this file except in compliance with the License.
-#
-# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
-# or http://www.opensolaris.org/os/licensing.
-# See the License for the specific language governing permissions
-# and limitations under the License.
-#
-# When distributing Covered Code, include this CDDL HEADER in each
-# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
-# If applicable, add the following below this CDDL HEADER, with the
-# fields enclosed by brackets "[]" replaced with your own identifying
-# information: Portions Copyright [yyyy] [name of copyright owner]
-#
-# CDDL HEADER END
-#
-
-#
-# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
-#
-
-
-set name=pkg.fmri \
-    value=pkg:/library/python/pycairo-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
-set name=pkg.summary \
-    value="Python $(MAYBE_PYVER_SPACE)bindings for the Cairo graphics library"
-set name=com.oracle.info.description \
-    value="Python $(MAYBE_PYVER_SPACE)bindings for Cairo"
-set name=com.oracle.info.tpno value=$(TPNO)
-set name=info.classification \
-    value=org.opensolaris.category.2008:Development/Python
-set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
-set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
-set name=org.opensolaris.arc-caseid value=PSARC/2014/371
-set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
-file path=usr/include/pycairo/pycairo.h
-link path=usr/include/pycairo27 target=pycairo
-file path=usr/lib/pkgconfig/pycairo.pc
-link path=usr/lib/pkgconfig/pycairo27.pc target=pycairo.pc
-file path=usr/lib/python$(PYVER)/vendor-packages/cairo/64/_cairo.so
-file path=usr/lib/python$(PYVER)/vendor-packages/cairo/__init__.py
-file path=usr/lib/python$(PYVER)/vendor-packages/cairo/_cairo.so
-license COPYING license=LGPL-2.1,MPL-1.1
-license COPYING-MPL-1.1 license=MPL-1.1
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycairo/Makefile	Wed Sep 21 19:51:41 2016 -0700
@@ -0,0 +1,91 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+BUILD_BITS =            64
+include ../../../make-rules/shared-macros.mk
+
+COMPONENT_NAME=		pycairo
+COMPONENT_VERSION=	1.10.0
+COMPONENT_PROJECT_URL=	http://cairographics.org/pycairo/
+COMPONENT_ARCHIVE=      $(COMPONENT_NAME)-$(COMPONENT_VERSION).tar.bz2
+COMPONENT_ARCHIVE_HASH=	\
+    sha256:9aa4078e7eb5be583aeabbe8d87172797717f95e8c4338f0d4a17b683a7253be
+COMPONENT_ARCHIVE_URL=	http://cairographics.org/releases/$(COMPONENT_ARCHIVE)
+COMPONENT_BUGDB=	python-mod/pycairo
+
+TPNO=			30739
+
+# upstream delivers python2 support separately as "py2cairo"
+PYTHON_VERSIONS=        $(PYTHON3_VERSIONS)
+
+BUILD_STYLE= waf
+
+# replicated from $(WS_MAKE_RULES)/setup.py.mk since this uses waf.mk instead
+CONFIGURE_64 = $(PYTHON3_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.configured)
+BUILD_64     = $(PYTHON3_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.built)
+INSTALL_64   = $(PYTHON3_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.installed)
+TEST_64      = $(PYTHON3_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.tested-and-compared)
+
+# Cannot run tests until build machines update to s12_105 due to bug 23763105
+TEST_TARGET = $(SKIP_TEST)
+
+include $(WS_MAKE_RULES)/common.mk
+
+# Trick bundled waf into unpacking itself so we can patch it
+COMPONENT_POST_UNPACK_ACTION += \
+	(cd $(@D) ; $(PYTHON.3.5) waf --help >> /dev/null );
+
+# Do not install optimised compiled .pyo files
+CONFIGURE_OPTIONS += --nopyo
+
+# The bundled waf compiles to the old pre-python-3.2 locations, so
+# tell it not to bother, and take care of it ourselves
+CONFIGURE_OPTIONS += --nopyc
+COMPONENT_POST_INSTALL_ACTION += \
+	$(PYTHON) -m compileall $(PROTO_DIR)$(PYTHON_LIB)/cairo ;
+
+# waf picks up the PYTHONDIR & PYTHONARCHDIR settings at configure time,
+# but still insists on installing to site-packages instead of vendor-packages
+PYTHON_SITE_DIR = $(USRLIB)/python$(PYTHON_VERSION)/site-packages
+COMPONENT_PRE_INSTALL_ACTION += \
+	$(MKDIR) $(PROTO_DIR)$(PYTHON_LIB)/cairo \
+		 $(PROTO_DIR)$(PYTHON_SITE_DIR) ; \
+	$(RM) -r $(PROTO_DIR)$(PYTHON_SITE_DIR) ; \
+	$(LN) -s $(PROTO_DIR)$(PYTHON_LIB) $(PROTO_DIR)$(PYTHON_SITE_DIR) ; \
+	$(RM) -r $(PROTO_DIR)$(PYTHON_LIB)/cairo/64 ; \
+	$(LN) -s . $(PROTO_DIR)$(PYTHON_LIB)/cairo/64
+
+# the test scripts aren't hooked into the test target in pycairo, so run directly
+COMPONENT_TEST_DIR = $(@D)/test
+COMPONENT_TEST_CMD = /usr/bin/py.test-$(PYTHON_VERSION)
+COMPONENT_TEST_TARGETS =
+
+REQUIRED_PACKAGES += library/desktop/cairo
+REQUIRED_PACKAGES += runtime/python-34
+REQUIRED_PACKAGES += runtime/python-35
+
+# py.test is required for testing, not building or runtime
+REQUIRED_PACKAGES += library/python/pytest
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycairo/patches/01-waf-python-config.patch	Wed Sep 21 19:51:41 2016 -0700
@@ -0,0 +1,15 @@
+Workaround https://github.com/waf-project/waf/issues/1515 since pycairo
+bundled a much older version of waf without that fix, so waf assumes
+python*-config is a python script and barfs on our shell script version.
+
+--- pycairo-1.10.0/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py
++++ pycairo-1.10.0/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Tools/python.py
[email protected]@ -169,7 +169,7 @@
+ 		conf.find_program('python-config-%s'%num,var='PYTHON_CONFIG',mandatory=False)
+ 	includes=[]
+ 	if conf.env.PYTHON_CONFIG:
+-		for incstr in conf.cmd_and_log(conf.env.PYTHON+[conf.env.PYTHON_CONFIG,'--includes']).strip().split():
++		for incstr in conf.cmd_and_log([conf.env.PYTHON_CONFIG,'--includes']).strip().split():
+ 			if(incstr.startswith('-I')or incstr.startswith('/I')):
+ 				incstr=incstr[2:]
+ 			if incstr not in includes:
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycairo/patches/02-waf-pickle.patch	Wed Sep 21 19:51:41 2016 -0700
@@ -0,0 +1,14 @@
+Patch from upstream bug https://bugs.freedesktop.org/show_bug.cgi?id=76759
+to fix build with Python 3.5
+
+--- pycairo-1.10.0/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Build.py.orig       2011-03-29 10:52:54.000000000 -0400
++++ pycairo-1.10.0/.waf3-1.6.4-e3c1e08604b18a10567cfcd2d02eb6e6/waflib/Build.py        
[email protected]@ -162,6 +162,8 @@
+ 			try:
+ 				f=open(db+'.tmp','wb')
+ 				cPickle.dump(data,f)
++			except AttributeError as err:
++				print(format(err))
+ 			finally:
+ 				if f:
+ 					f.close()
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycairo/pycairo-GENFRAG.p5m	Wed Sep 21 19:51:41 2016 -0700
@@ -0,0 +1,32 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+file path=usr/include/pycairo/py3cairo.h
+file path=usr/lib/$(MACH64)/pkgconfig/py3cairo.pc
+license COPYING license=GPLv3
+license COPYING.LESSER license=LGPLv3
+# Manually added since python2 version is built separately in ../py2cairo
+depend type=conditional fmri=library/python/pycairo-27 \
+    predicate=runtime/python-27
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/components/python/pycairo/pycairo-PYVER.p5m	Wed Sep 21 19:51:41 2016 -0700
@@ -0,0 +1,48 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+
+#
+# Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
+#
+
+set name=pkg.fmri \
+    value=pkg:/library/python/pycairo-$(PYV)@$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
+set name=pkg.summary \
+    value="Python $(MAYBE_PYVER_SPACE)bindings for the Cairo graphics library"
+set name=com.oracle.info.description \
+    value="Python $(MAYBE_PYVER_SPACE)bindings for Cairo"
+set name=com.oracle.info.tpno value=$(TPNO)
+set name=info.classification \
+    value=org.opensolaris.category.2008:Development/Python
+set name=info.source-url value=$(COMPONENT_ARCHIVE_URL)
+set name=info.upstream-url value=$(COMPONENT_PROJECT_URL)
+set name=org.opensolaris.arc-caseid value=PSARC/2014/371
+set name=org.opensolaris.consolidation value=$(CONSOLIDATION)
+#
+file path=usr/lib/python$(PYVER)/vendor-packages/cairo/64/_cairo.so
+file path=usr/lib/python$(PYVER)/vendor-packages/cairo/__init__.py
+file path=usr/lib/python$(PYVER)/vendor-packages/cairo/_cairo.so
+license COPYING license=GPLv3
+license COPYING.LESSER license=LGPLv3
+
+# force a dependency on the unversioned package
+depend type=require \
+    fmri=library/python/[email protected]$(IPS_COMPONENT_VERSION),$(BUILD_VERSION)
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/make-rules/waf.mk	Wed Sep 21 19:51:41 2016 -0700
@@ -0,0 +1,236 @@
+#
+# CDDL HEADER START
+#
+# The contents of this file are subject to the terms of the
+# Common Development and Distribution License (the "License").
+# You may not use this file except in compliance with the License.
+#
+# You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
+# or http://www.opensolaris.org/os/licensing.
+# See the License for the specific language governing permissions
+# and limitations under the License.
+#
+# When distributing Covered Code, include this CDDL HEADER in each
+# file and include the License file at usr/src/OPENSOLARIS.LICENSE.
+# If applicable, add the following below this CDDL HEADER, with the
+# fields enclosed by brackets "[]" replaced with your own identifying
+# information: Portions Copyright [yyyy] [name of copyright owner]
+#
+# CDDL HEADER END
+#
+# Copyright (c) 2011, 2016, Oracle and/or its affiliates. All rights reserved.
+#
+#
+# Rules and Macros for building opens source software that uses the waf
+# build system from https://waf.io/
+#
+# To use these rules, include $(WS_MAKE_RULES)/waf.mk in your Makefile
+# and define "build", "install" targets appropriate to building your component.
+# Ex:
+#
+# 	build:		$(BUILD_32) \
+#	 		$(BUILD_64)
+# 
+#	install:	$(INSTALL_32) \
+#	 		$(INSTALL_64)
+#
+# Any additional pre/post configure, build, or install actions can be specified
+# in your Makefile by setting them in on of the following macros:
+#	COMPONENT_PRE_BUILD_ACTION, COMPONENT_POST_BUILD_ACTION
+#	COMPONENT_PRE_INSTALL_ACTION, COMPONENT_POST_INSTALL_ACTION
+#
+# If component specific make targets need to be used for build or install, they
+# can be specified in
+#	COMPONENT_BUILD_TARGETS, COMPONENT_INSTALL_TARGETS
+#
+
+# Defaults to looking for waf script in top level of cloned source
+WAF = $(PYTHON) waf
+
+CONFIGURE_PREFIX =	/usr
+
+CONFIGURE_BINDIR.32 =	$(CONFIGURE_PREFIX)/bin
+CONFIGURE_BINDIR.64 =	$(CONFIGURE_PREFIX)/bin/$(MACH64)
+CONFIGURE_LIBDIR.32 =	$(CONFIGURE_PREFIX)/lib
+CONFIGURE_LIBDIR.64 =	$(CONFIGURE_PREFIX)/lib/$(MACH64)
+CONFIGURE_SBINDIR.32 =	$(CONFIGURE_PREFIX)/sbin
+CONFIGURE_SBINDIR.64 =	$(CONFIGURE_PREFIX)/sbin/$(MACH64)
+CONFIGURE_MANDIR =	$(CONFIGURE_PREFIX)/share/man
+CONFIGURE_LOCALEDIR =	$(CONFIGURE_PREFIX)/share/locale
+
+CONFIGURE_DEFAULT_DIRS?=yes
+CONFIGURE_OPTIONS += --prefix=$(CONFIGURE_PREFIX)
+ifeq ($(CONFIGURE_DEFAULT_DIRS),yes)
+CONFIGURE_OPTIONS += --mandir=$(CONFIGURE_MANDIR)
+ifeq ($(INITIAL_BITS),64)
+CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.32)
+CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.32)
+else
+CONFIGURE_OPTIONS += --bindir=$(CONFIGURE_BINDIR.$(BITS))
+CONFIGURE_OPTIONS += --sbindir=$(CONFIGURE_SBINDIR.$(BITS))
+endif
+CONFIGURE_OPTIONS += --libdir=$(CONFIGURE_LIBDIR.$(BITS))
+endif
+CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.$(BITS))
+CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.$(MACH))
+CONFIGURE_OPTIONS += $(CONFIGURE_OPTIONS.$(MACH).$(BITS))
+
+CONFIGURE_ENV += CC="$(CC) $(CC_BITS)"
+CONFIGURE_ENV += CFLAGS="$(CFLAGS)"
+CONFIGURE_ENV += CXX="$(CXX) $(CC_BITS)"
+CONFIGURE_ENV += CXXFLAGS="$(CXXFLAGS)"
+CONFIGURE_ENV += LDFLAGS="$(LDFLAGS)"
+CONFIGURE_ENV += PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)"
+CONFIGURE_ENV += PYTHON="$(PYTHON)"
+CONFIGURE_ENV += PYTHONDIR="$(PYTHON_LIB)"
+CONFIGURE_ENV += PYTHONARCHDIR="$(PYTHON_VENDOR_PACKAGES)"
+
+# configure the unpacked source
+COMPONENT_CONFIGURE_TARGETS ?= configure
+
+$(BUILD_DIR_32)/.configured:		BITS=32
+$(BUILD_DIR_64)/.configured:		BITS=64
+$(BUILD_DIR)/$(MACH32)-%/.configured:	BITS=32
+$(BUILD_DIR)/$(MACH64)-%/.configured:	BITS=64
+$(foreach pyver, $(PYTHON_VERSIONS), \
+    $(eval $(BUILD_DIR)/%-$(pyver)/.configured: PYTHON_VERSION=$(pyver)) \
+)
+
+$(BUILD_DIR)/%/.configured:	$(SOURCE_DIR)/.prep
+	$(RM) -r $(@D) ; $(MKDIR) $(@D)
+	$(CLONEY) $(SOURCE_DIR) $(@D)
+	$(COMPONENT_PRE_CONFIGURE_ACTION)
+	(cd $(@D) ; $(ENV) $(CONFIGURE_ENV) \
+		$(WAF) $(COMPONENT_CONFIGURE_TARGETS) $(CONFIGURE_OPTIONS))
+	$(COMPONENT_POST_CONFIGURE_ACTION)
+	$(TOUCH) [email protected]
+
+# build the configured source
+COMPONENT_BUILD_TARGETS ?= build
+
+$(BUILD_DIR_32)/.built:			BITS=32
+$(BUILD_DIR_64)/.built:			BITS=64
+$(BUILD_DIR)/$(MACH32)-%/.built:	BITS=32
+$(BUILD_DIR)/$(MACH64)-%/.built:	BITS=64
+$(foreach pyver, $(PYTHON_VERSIONS), \
+    $(eval $(BUILD_DIR)/%-$(pyver)/.built: PYTHON_VERSION=$(pyver)) \
+)
+
+$(BUILD_DIR)/%/.built:	$(BUILD_DIR)/%/.configured
+	$(COMPONENT_PRE_BUILD_ACTION)
+	(cd $(@D) ; $(ENV) $(COMPONENT_BUILD_ENV) \
+		$(WAF) $(COMPONENT_BUILD_TARGETS) $(COMPONENT_BUILD_ARGS))
+	$(COMPONENT_POST_BUILD_ACTION)
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+	-$(PARFAIT) $(@D)
+endif
+	$(TOUCH) [email protected]
+
+# If BUILD_STYLE is set, provide a default configure target.
+ifeq   ($(strip $(BUILD_STYLE)),waf)
+configure:	$(CONFIGURE_$(MK_BITS))
+endif
+
+# install the built source into a prototype area
+COMPONENT_INSTALL_ARGS += --destdir=$(PROTO_DIR)
+COMPONENT_INSTALL_ARGS += $(COMPONENT_INSTALL_ARGS.$(BITS))
+
+$(BUILD_DIR_32)/.installed:		BITS=32
+$(BUILD_DIR_64)/.installed:		BITS=64
+$(BUILD_DIR)/$(MACH32)-%/.installed:	BITS=32
+$(BUILD_DIR)/$(MACH64)-%/.installed:	BITS=64
+$(foreach pyver, $(PYTHON_VERSIONS), \
+    $(eval $(BUILD_DIR)/%-$(pyver)/.installed: PYTHON_VERSION=$(pyver)) \
+)
+
+$(BUILD_DIR)/%/.installed:	$(BUILD_DIR)/%/.built
+	$(COMPONENT_PRE_INSTALL_ACTION)
+	(cd $(@D) ; $(ENV) $(COMPONENT_INSTALL_ENV) \
+		 $(WAF) $(COMPONENT_INSTALL_TARGETS) $(COMPONENT_INSTALL_ARGS))
+	$(COMPONENT_POST_INSTALL_ACTION)
+	$(TOUCH) [email protected]
+
+# test the built source
+COMPONENT_TEST_CMD = $(WAF)
+COMPONENT_TEST_TARGETS = test
+
+$(BUILD_DIR_32)/.tested-and-compared:		BITS=32
+$(BUILD_DIR_64)/.tested-and-compared:		BITS=64
+$(BUILD_DIR)/$(MACH32)-%/.tested-and-compared:	BITS=32
+$(BUILD_DIR)/$(MACH64)-%/.tested-and-compared:	BITS=64
+$(foreach pyver, $(PYTHON_VERSIONS), \
+    $(eval $(BUILD_DIR)/%-$(pyver)/.tested-and-compared: PYTHON_VERSION=$(pyver)) \
+)
+
+$(BUILD_DIR)/%/.tested-and-compared:    $(BUILD_DIR)/%/.built
+	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
+	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
+	$(COMPONENT_PRE_TEST_ACTION)
+	-(cd $(COMPONENT_TEST_DIR) ; \
+		$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \
+		$(COMPONENT_TEST_CMD) \
+		$(COMPONENT_TEST_TARGETS) $(COMPONENT_TEST_ARGS)) \
+		&> $(COMPONENT_TEST_OUTPUT)
+	$(COMPONENT_POST_TEST_ACTION)
+	$(COMPONENT_TEST_CREATE_TRANSFORMS)
+	$(COMPONENT_TEST_PERFORM_TRANSFORM)
+	$(COMPONENT_TEST_COMPARE)
+	$(COMPONENT_TEST_CLEANUP)
+	$(TOUCH) [email protected]
+
+$(BUILD_DIR_32)/.tested:		BITS=32
+$(BUILD_DIR_64)/.tested:		BITS=64
+$(BUILD_DIR)/$(MACH32)-%/.tested:	BITS=32
+$(BUILD_DIR)/$(MACH64)-%/.tested:	BITS=64
+$(foreach pyver, $(PYTHON_VERSIONS), \
+    $(eval $(BUILD_DIR)/%-$(pyver)/.tested: PYTHON_VERSION=$(pyver)) \
+)
+
+$(BUILD_DIR)/%/.tested:    $(BUILD_DIR)/%/.built
+	$(COMPONENT_PRE_TEST_ACTION)
+	(cd $(COMPONENT_TEST_DIR) ; \
+		$(COMPONENT_TEST_ENV_CMD) $(COMPONENT_TEST_ENV) \
+		$(COMPONENT_TEST_CMD) \
+		$(COMPONENT_TEST_ARGS) $(COMPONENT_TEST_TARGETS))
+	$(COMPONENT_POST_TEST_ACTION)
+	$(COMPONENT_TEST_CLEANUP)
+	$(TOUCH) [email protected]
+
+# Test the installed packages.  The targets above depend on .built which
+# means $(CLONEY) has already run.  System-test needs cloning but not
+# building; thus ideally, we would want to depend on .cloned here and below,
+# but since we don't have that, we depend on .prep and run $(CLONEY) here.
+$(BUILD_DIR)/%/.system-tested-and-compared:    $(SOURCE_DIR)/.prep
+	$(RM) -rf $(COMPONENT_TEST_BUILD_DIR)
+	$(MKDIR) $(COMPONENT_TEST_BUILD_DIR)
+	$(CLONEY) $(SOURCE_DIR) $(@D)
+	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
+	-(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
+		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
+		$(COMPONENT_SYSTEM_TEST_CMD) \
+		$(COMPONENT_SYSTEM_TEST_ARGS) $(COMPONENT_SYSTEM_TEST_TARGETS)) \
+		&> $(COMPONENT_TEST_OUTPUT)
+	$(COMPONENT_POST_SYSTEM_TEST_ACTION)
+	$(COMPONENT_TEST_CREATE_TRANSFORMS)
+	$(COMPONENT_TEST_PERFORM_TRANSFORM)
+	$(COMPONENT_TEST_COMPARE)
+	$(COMPONENT_SYSTEM_TEST_CLEANUP)
+	$(TOUCH) [email protected]
+
+$(BUILD_DIR)/%/.system-tested:    $(SOURCE_DIR)/.prep
+	$(CLONEY) $(SOURCE_DIR) $(@D)
+	$(COMPONENT_PRE_SYSTEM_TEST_ACTION)
+	(cd $(COMPONENT_SYSTEM_TEST_DIR) ; \
+		$(COMPONENT_SYSTEM_TEST_ENV_CMD) $(COMPONENT_SYSTEM_TEST_ENV) \
+		$(COMPONENT_SYSTEM_TEST_CMD) \
+		$(COMPONENT_SYSTEM_TEST_ARGS) $(COMPONENT_SYSTEM_TEST_TARGETS))
+	$(COMPONENT_POST_SYSTEM_TEST_ACTION)
+	$(COMPONENT_SYSTEM_TEST_CLEANUP)
+	$(TOUCH) [email protected]
+
+ifeq   ($(strip $(PARFAIT_BUILD)),yes)
+parfait: build
+else
+parfait:
+	$(MAKE) PARFAIT_BUILD=yes parfait
+endif