Difuse/packages
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #9103 from jefferyto/python-host-patch-upgraded-setuptools-pip

Browse source 
python,python3: Allow upgraded host setuptools/pip to be patched
This commit is contained in:
Hannu Nyman 2019-05-30 11:11:26 +03:00 committed by GitHub
commit e3dbc87bd9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
lang/python/python/Makefile
View file

@ -314,14 +314,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))

14
lang/python/python3/Makefile
View file

@ -309,14 +309,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))