diff options
| author | Hannu Nyman <hannu.nyman@iki.fi> | 2019-05-30 11:11:26 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-30 11:11:26 +0300 |
| commit | e3dbc87bd9a00455fffa7ac82a414b7e5e6f4d65 (patch) | |
| tree | 652c05354a0fe10ffab38cfe319e156e6d49b8a3 /lang/python/python3 | |
| parent | b7e689aefdd6f785909349e80e03f4053ac7a458 (diff) | |
| parent | e074cbc285af59290951f286a54de487b5b7e847 (diff) | |
Merge pull request #9103 from jefferyto/python-host-patch-upgraded-setuptools-pip
python,python3: Allow upgraded host setuptools/pip to be patched
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 e9468c97f..76be31472 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -309,14 +309,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)) |