From 924d698652ea9e31605128b96fafd0cc3c349c1b Mon Sep 17 00:00:00 2001 From: Alexander Pyhalov <apyhalov@gmail.com> Date: Fri, 17 Jul 2020 15:31:41 +0200 Subject: [PATCH] oi-userland: avoid references to Python 3.4 --- make-rules/setup.py.mk | 10 +--------- 1 files changed, 1 insertions(+), 9 deletions(-) diff --git a/make-rules/setup.py.mk b/make-rules/setup.py.mk index 1510f17..45bb5fc 100644 --- a/make-rules/setup.py.mk +++ b/make-rules/setup.py.mk @@ -23,28 +23,24 @@ $(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 $(BUILD_DIR)/%-3.5/.built: PYTHON_VERSION=3.5 $(BUILD_DIR)/$(MACH32)-%/.built: BITS=32 $(BUILD_DIR)/$(MACH64)-%/.built: BITS=64 $(BUILD_DIR)/%-2.6/.installed: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.installed: PYTHON_VERSION=2.7 -$(BUILD_DIR)/%-3.4/.installed: PYTHON_VERSION=3.4 $(BUILD_DIR)/%-3.5/.installed: PYTHON_VERSION=3.5 $(BUILD_DIR)/$(MACH32)-%/.installed: BITS=32 $(BUILD_DIR)/$(MACH64)-%/.installed: BITS=64 $(BUILD_DIR)/%-2.6/.tested: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.tested: PYTHON_VERSION=2.7 -$(BUILD_DIR)/%-3.4/.tested: PYTHON_VERSION=3.4 $(BUILD_DIR)/%-3.5/.tested: PYTHON_VERSION=3.5 $(BUILD_DIR)/$(MACH32)-%/.tested: BITS=32 $(BUILD_DIR)/$(MACH64)-%/.tested: BITS=64 $(BUILD_DIR)/%-2.6/.tested-and-compared: PYTHON_VERSION=2.6 $(BUILD_DIR)/%-2.7/.tested-and-compared: PYTHON_VERSION=2.7 -$(BUILD_DIR)/%-3.4/.tested-and-compared: PYTHON_VERSION=3.4 $(BUILD_DIR)/%-3.5/.tested-and-compared: PYTHON_VERSION=3.5 $(BUILD_DIR)/$(MACH32)-%/.tested-and-compared: BITS=32 $(BUILD_DIR)/$(MACH64)-%/.tested-and-compared: BITS=64 @@ -74,13 +70,9 @@ # Reset arguments specified as environmnent variables COMPONENT_BUILD_ARGS = -# If we are building Python 3.4 or 3.5 support, build them and install them +# If we are building Python 3.5 support, build it and install it # before Python 2.7, so 2.7 is installed last and is the canonical version. # When we change the default, the new default should go last. -ifneq ($(findstring 3.4,$(PYTHON_VERSIONS)),) -$(BUILD_DIR)/%-2.7/.built: $(BUILD_DIR)/%-3.4/.built -$(BUILD_DIR)/%-2.7/.installed: $(BUILD_DIR)/%-3.4/.installed -endif ifneq ($(findstring 3.5,$(PYTHON_VERSIONS)),) $(BUILD_DIR)/%-2.7/.built: $(BUILD_DIR)/%-3.5/.built $(BUILD_DIR)/%-2.7/.installed: $(BUILD_DIR)/%-3.5/.installed -- Gitblit v1.9.3