LILiK
/
openwrt-packages-dist
5
0
Fork 0
Code Issues 0 Pull Requests 0 Projects 0 Releases 0 Wiki Activity
Browse Source

Merge pull request #7854 from commodo/python-pip-setuptools-ver 

python,python3: use setuptools & pip versions from python{3}-version.mk
lilik-openwrt-22.03
Hannu Nyman 6 years ago
committed by GitHub
parent
6101062547 a16dea9627
commit
e1415a295c
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +2
    -2
      lang/python/python/Makefile
  2. +2
    -2
      lang/python/python3/Makefile

+ 2
- 2
lang/python/python/Makefile View File

@ -170,7 +170,7 @@ define Build/Compile/python-setuptools
$(STAGING_DIR_HOSTPKG)/bin/pip install \ $(STAGING_DIR_HOSTPKG)/bin/pip install \
--ignore-installed \ --ignore-installed \
--root=$(PKG_BUILD_DIR)/install-setuptools --prefix=. \ --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 endef
endif # CONFIG_PACKAGE_python-setuptools endif # CONFIG_PACKAGE_python-setuptools
@ -179,7 +179,7 @@ define Build/Compile/python-pip
$(STAGING_DIR_HOSTPKG)/bin/pip install \ $(STAGING_DIR_HOSTPKG)/bin/pip install \
--ignore-installed \ --ignore-installed \
--root=$(PKG_BUILD_DIR)/install-pip --prefix=. \ --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 endef
endif # CONFIG_PACKAGE_python-pip endif # CONFIG_PACKAGE_python-pip


+ 2
- 2
lang/python/python3/Makefile View File

@ -174,7 +174,7 @@ define Build/Compile/python3-setuptools
$(STAGING_DIR_HOSTPKG)/bin/pip3 install \ $(STAGING_DIR_HOSTPKG)/bin/pip3 install \
--ignore-installed \ --ignore-installed \
--root=$(PKG_BUILD_DIR)/install-setuptools --prefix=. \ --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 endef
endif # CONFIG_PACKAGE_python3-setuptools endif # CONFIG_PACKAGE_python3-setuptools
@ -183,7 +183,7 @@ define Build/Compile/python3-pip
$(STAGING_DIR_HOSTPKG)/bin/pip3 install \ $(STAGING_DIR_HOSTPKG)/bin/pip3 install \
--ignore-installed \ --ignore-installed \
--root=$(PKG_BUILD_DIR)/install-pip --prefix=. \ --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 endef
endif # CONFIG_PACKAGE_python3-pip endif # CONFIG_PACKAGE_python3-pip


Write Preview
Loading…
Cancel
Save