Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

python,python3: use setuptools & pip versions from python{3}-version.mk

Browse source 
`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 <ardeleanalex@gmail.com>
This commit is contained in:
Alexandru Ardelean 2019-01-02 20:10:42 +02:00
parent 582f402907
commit a16dea9627
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lang/python/python/Makefile
View file

@ -170,7 +170,7 @@ define Build/Compile/python-setuptools
$(STAGING_DIR_HOSTPKG)/bin/pip 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-$(PYTHON_SETUPTOOLS_VERSION)-py2.py3-none-any.whl
endef
endif # CONFIG_PACKAGE_python-setuptools
@ -179,7 +179,7 @@ define Build/Compile/python-pip
$(STAGING_DIR_HOSTPKG)/bin/pip 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-$(PYTHON_PIP_VERSION)-py2.py3-none-any.whl
endef
endif # CONFIG_PACKAGE_python-pip

4
lang/python/python3/Makefile
View file

@ -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