From 453bf5a3004107204e1858532a38b3e703e32995 Mon Sep 17 00:00:00 2001 From: Andrzej Szeszo <aszeszo@gmail.com> Date: Tue, 04 Jun 2013 12:32:37 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/upstream' into oi/hipster --- make-rules/setup.py.mk | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/make-rules/setup.py.mk b/make-rules/setup.py.mk index fbe81fd..0d24d4a 100644 --- a/make-rules/setup.py.mk +++ b/make-rules/setup.py.mk @@ -33,12 +33,20 @@ BUILD_32 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH32)-%/.built) BUILD_64 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.built) +BUILD_NO_ARCH = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH)-%/.built) INSTALL_32 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH32)-%/.installed) INSTALL_64 = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH64)-%/.installed) +INSTALL_NO_ARCH = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH)-%/.installed) + +TEST_NO_ARCH = $(PYTHON_VERSIONS:%=$(BUILD_DIR)/$(MACH)-%/.tested) PYTHON_ENV = CC="$(CC)" PYTHON_ENV += CFLAGS="$(CFLAGS)" + +COMPONENT_BUILD_ENV += $(PYTHON_ENV) +COMPONENT_INSTALL_ENV += $(PYTHON_ENV) +COMPONENT_TEST_ENV += $(PYTHON_ENV) # if we are building python 2.7 support, build it and install it first # so that python 2.6 is installed last and is the canonical version. @@ -61,7 +69,7 @@ $(BUILD_DIR)/%/.built: $(SOURCE_DIR)/.prep $(BUILD_DIR)/config-%/$(CFG) $(RM) -r $(@D) ; $(MKDIR) $(@D) $(COMPONENT_PRE_BUILD_ACTION) - (cd $(SOURCE_DIR) ; $(ENV) HOME=$(BUILD_DIR)/config-$* $(PYTHON_ENV) \ + (cd $(SOURCE_DIR) ; $(ENV) HOME=$(BUILD_DIR)/config-$* $(COMPONENT_BUILD_ENV) \ $(PYTHON.$(BITS)) ./setup.py build) $(COMPONENT_POST_BUILD_ACTION) ifeq ($(strip $(PARFAIT_BUILD)),yes) -- Gitblit v1.9.3