cubixle/packages
1
0
Fork 0
mirror of https://github.com/novatiq/packages.git synced 2026-04-30 15:38:40 +01:00
Code Issues Packages Projects Releases Wiki Activity

python,python3: Allow upgraded host setuptools/pip to be patched

Browse Source 
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>
This commit is contained in:
Jeffery To
2019-05-30 01:48:29 +08:00
parent e9d59949ce
commit e074cbc285
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lang/python/python/Makefile
+8 -6
View File
@@ -306,14 +306,16 @@ define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) install $(MAKE) -C $(HOST_BUILD_DIR) install
$(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/ $(INSTALL_DIR) $(HOST_PYTHON_DIR)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON_DIR)/bin/pgen2 $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON_DIR)/bin/pgen2
ifeq ($(wildcard $(HOST_PYTHON_PKG_DIR)/.setuptools-patched),) $(if $(wildcard $(HOST_PYTHON_PKG_DIR)/.setuptools-patched-$(PYTHON_SETUPTOOLS_VERSION)),,
$(call HostPatchDir,$(HOST_PYTHON_PKG_DIR),./patches-setuptools,) $(call HostPatchDir,$(HOST_PYTHON_PKG_DIR),./patches-setuptools,)
touch $(HOST_PYTHON_PKG_DIR)/.setuptools-patched rm -f $(HOST_PYTHON_PKG_DIR)/.setuptools-patched-*
endif touch $(HOST_PYTHON_PKG_DIR)/.setuptools-patched-$(PYTHON_SETUPTOOLS_VERSION)
ifeq ($(wildcard $(HOST_PYTHON_PKG_DIR)/.pip-patched),) )
$(if $(wildcard $(HOST_PYTHON_PKG_DIR)/.pip-patched-$(PYTHON_PIP_VERSION)),,
$(call HostPatchDir,$(HOST_PYTHON_PKG_DIR),./patches-pip,) $(call HostPatchDir,$(HOST_PYTHON_PKG_DIR),./patches-pip,)
touch $(HOST_PYTHON_PKG_DIR)/.pip-patched rm -f $(HOST_PYTHON_PKG_DIR)/.pip-patched-*
endif touch $(HOST_PYTHON_PKG_DIR)/.pip-patched-$(PYTHON_PIP_VERSION)
)
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))
lang/python/python3/Makefile
+8 -6
View File
@@ -301,14 +301,16 @@ define Host/Install
$(MAKE) -C $(HOST_BUILD_DIR) install $(MAKE) -C $(HOST_BUILD_DIR) install
$(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/ $(INSTALL_DIR) $(HOST_PYTHON3_DIR)/bin/
$(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON3_DIR)/bin/pgen3 $(INSTALL_BIN) $(HOST_BUILD_DIR)/Parser/pgen $(HOST_PYTHON3_DIR)/bin/pgen3
ifeq ($(wildcard $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched),) $(if $(wildcard $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched-$(PYTHON3_SETUPTOOLS_VERSION)),,
$(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-setuptools,) $(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-setuptools,)
touch $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched rm -f $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched-*
endif touch $(HOST_PYTHON3_PKG_DIR)/.setuptools-patched-$(PYTHON3_SETUPTOOLS_VERSION)
ifeq ($(wildcard $(HOST_PYTHON3_PKG_DIR)/.pip-patched),) )
$(if $(wildcard $(HOST_PYTHON3_PKG_DIR)/.pip-patched-$(PYTHON3_PIP_VERSION)),,
$(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-pip,) $(call HostPatchDir,$(HOST_PYTHON3_PKG_DIR),./patches-pip,)
touch $(HOST_PYTHON3_PKG_DIR)/.pip-patched rm -f $(HOST_PYTHON3_PKG_DIR)/.pip-patched-*
endif touch $(HOST_PYTHON3_PKG_DIR)/.pip-patched-$(PYTHON3_PIP_VERSION)
)
endef endef
$(eval $(call HostBuild)) $(eval $(call HostBuild))