Merge pull request #13266 from jefferyto/pip-locked-openwrt-19.07

[openwrt-19.07] python,python3: Use locked for host pip
This commit is contained in:
Rosen Penev 2020-08-31 14:09:00 -07:00 committed by GitHub
commit 59078a0982
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 19 additions and 13 deletions

View file

@ -74,12 +74,15 @@ HOST_PYTHON_PIP:=$(STAGING_DIR_HOSTPKG)/bin/pip$(PYTHON_VERSION)
# $(1) => packages to install # $(1) => packages to install
define Build/Compile/HostPyPipInstall define Build/Compile/HostPyPipInstall
$(call locked, \
$(call host_python_settings) \ $(call host_python_settings) \
$(HOST_PYTHON_PIP) \ $(HOST_PYTHON_PIP) \
--disable-pip-version-check \ --disable-pip-version-check \
--cache-dir "$(DL_DIR)/pip-cache" \ --cache-dir "$(DL_DIR)/pip-cache" \
install \ install \
$(1) $(1), \
pip \
)
endef endef
# $(1) => build subdir # $(1) => build subdir

View file

@ -73,13 +73,16 @@ HOST_PYTHON3_PIP:=$(STAGING_DIR_HOSTPKG)/bin/pip$(PYTHON3_VERSION)
# $(1) => packages to install # $(1) => packages to install
define Build/Compile/HostPy3PipInstall define Build/Compile/HostPy3PipInstall
$(call locked, \
$(call host_python3_settings) \ $(call host_python3_settings) \
$(HOST_PYTHON3_PIP) \ $(HOST_PYTHON3_PIP) \
--disable-pip-version-check \ --disable-pip-version-check \
--cache-dir "$(DL_DIR)/pip-cache" \ --cache-dir "$(DL_DIR)/pip-cache" \
install \ install \
--no-binary :all: \ --no-binary :all: \
$(1) $(1), \
pip \
)
endef endef
# $(1) => build subdir # $(1) => build subdir