diff -r 60344306d223 -r 30b42c38bbc4 make-rules/setup.py.mk --- a/make-rules/setup.py.mk Mon Feb 16 13:54:04 2015 -0800 +++ b/make-rules/setup.py.mk Sun Feb 15 19:02:09 2015 -0600 @@ -18,9 +18,12 @@ # # CDDL HEADER END # -# Copyright (c) 2010, 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2015, Oracle and/or its affiliates. All rights reserved. # +# $ (foreach suffix,$(VERSIONS),$(eval include $(WS_MAKE_RULES)/python-$(suffix).mk)) + + $(BUILD_DIR)/%-2.6/.built: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.built: PYTHON_VERSION=2.7 $(BUILD_DIR)/%-3.4/.built: PYTHON_VERSION=3.4 @@ -180,3 +183,14 @@ # Make it easy to construct a URL for a pypi source download. PYPI_BASE = http://pypi.python.org/packages/source pypi_url = $(PYPI_BASE)/$(shell echo $(COMPONENT_NAME) | cut -c1)/$(COMPONENT_NAME)/$(COMPONENT_ARCHIVE) + +ifneq ($(findstring 2.6, $(PYTHON_VERSIONS)),) +REQUIRED_PACKAGES += runtime/python-26 +endif +ifneq ($(findstring 2.7, $(PYTHON_VERSIONS)),) +REQUIRED_PACKAGES += runtime/python-27 +endif +ifneq ($(findstring 3.4, $(PYTHON_VERSIONS)),) +REQUIRED_PACKAGES += runtime/python-34 +endif +REQUIRED_PACKAGES += library/python/setuptools