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
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
define Build/Compile/HostPyPipInstall
$(call host_python_settings) \
$(HOST_PYTHON_PIP) \
--disable-pip-version-check \
--cache-dir "$(DL_DIR)/pip-cache" \
install \
$(1)
$(call locked, \
$(call host_python_settings) \
$(HOST_PYTHON_PIP) \
--disable-pip-version-check \
--cache-dir "$(DL_DIR)/pip-cache" \
install \
$(1), \
pip \
)
endef
# $(1) => build subdir

View File

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