From a16dea96274ca85cba19e2afc52530a02e661bd5 Mon Sep 17 00:00:00 2001 From: Alexandru Ardelean Date: Wed, 2 Jan 2019 20:10:42 +0200 Subject: python,python3: use setuptools & pip versions from python{3}-version.mk `setuptools` & `pip` whl files were selected via wildcards, because it was easier in the beginning. Also, initially there weren't any PYTHON{3}_{SETUTPTOOLS/PIP}_VERSION variables. But now since these vars exist, it makes sense to use them, because we can catch easier (at build) time if Python/Python3 bump these versions. Signed-off-by: Alexandru Ardelean --- lang/python/python3/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'lang/python/python3') diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index d6fec695c..e4116e27d 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -174,7 +174,7 @@ define Build/Compile/python3-setuptools $(STAGING_DIR_HOSTPKG)/bin/pip3 install \ --ignore-installed \ --root=$(PKG_BUILD_DIR)/install-setuptools --prefix=. \ - $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/setuptools-*.whl + $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/setuptools-$(PYTHON3_SETUPTOOLS_VERSION)-py2.py3-none-any.whl endef endif # CONFIG_PACKAGE_python3-setuptools @@ -183,7 +183,7 @@ define Build/Compile/python3-pip $(STAGING_DIR_HOSTPKG)/bin/pip3 install \ --ignore-installed \ --root=$(PKG_BUILD_DIR)/install-pip --prefix=. \ - $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/pip-*.whl + $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/pip-$(PYTHON3_PIP_VERSION)-py2.py3-none-any.whl endef endif # CONFIG_PACKAGE_python3-pip -- cgit