diff options
| author | Jeffery To <jeffery.to@gmail.com> | 2019-05-30 01:48:29 +0800 |
|---|---|---|
| committer | Jeffery To <jeffery.to@gmail.com> | 2019-05-30 01:48:29 +0800 |
| commit | e074cbc285af59290951f286a54de487b5b7e847 (patch) | |
| tree | 62833f12ca8cb655111eea2d495fcc260f67e07a /lang/python/python3 | |
| parent | e9d59949ce9d809e74d051c74ecbaf8667b6dcd9 (diff) | |
python,python3: Allow upgraded host setuptools/pip to be patched
This adds the current setuptools/pip version numbers to the indicator
files' names, which should allow upgraded versions to be patched.
Signed-off-by: Jeffery To <jeffery.to@gmail.com>
Diffstat (limited to 'lang/python/python3')
| -rw-r--r-- | lang/python/python3/Makefile | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index 5b3dcf355..0dd5a8e70 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -301,14 +301,16 @@ define Host/Install $(MAKE) -C $(HOST_BUILD_DIR) install $(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/ $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON3_DIR)/bin/pgen3 - ifeq ($(wildcard $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched),) - $(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-setuptools,) - touch $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched - endif - ifeq ($(wildcard $(HOST_PYTHON3_PKG_DIR)/.pip-patched),) - $(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-pip,) - touch $(HOST_PYTHON3_PKG_DIR)/.pip-patched - endif + $(if $(wildcard $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched-$(PYTHON3_SETUPTOOLS_VERSION)),, + $(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-setuptools,) + rm -f $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched-* + touch $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched-$(PYTHON3_SETUPTOOLS_VERSION) + ) + $(if $(wildcard $(HOST_PYTHON3_PKG_DIR)/.pip-patched-$(PYTHON3_PIP_VERSION)),, + $(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-pip,) + rm -f $(HOST_PYTHON3_PKG_DIR)/.pip-patched-* + touch $(HOST_PYTHON3_PKG_DIR)/.pip-patched-$(PYTHON3_PIP_VERSION) + ) endef $(eval $(call HostBuild)) |