From 688825f37a44f08623e93df9abb008a7199dfe5c Mon Sep 17 00:00:00 2001 From: Jeffery To Date: Wed, 29 May 2019 22:29:20 +0800 Subject: [PATCH] python-setuptools,python-pip: Set pip cache dir, disable version check This adds --cache-dir and --disable-pip-version-check options for host pip, when "installing" target setuptools and pip. This also changes the pip command to use $(HOST_PYTHON[3]_PIP) from python[3]-host.mk. Signed-off-by: Jeffery To --- lang/python/python/Makefile | 10 ++++++++-- lang/python/python3/Makefile | 10 ++++++++-- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile index 979ccc771..0654b3f8e 100644 --- a/lang/python/python/Makefile +++ b/lang/python/python/Makefile @@ -170,7 +170,10 @@ endef ifdef CONFIG_PACKAGE_python-setuptools define Build/Compile/python-setuptools - $(STAGING_DIR_HOSTPKG)/bin/pip install \ + $(HOST_PYTHON_PIP) \ + --disable-pip-version-check \ + --cache-dir "$(DL_DIR)/pip-cache" \ + install \ --ignore-installed \ --root=$(PKG_BUILD_DIR)/install-setuptools --prefix=. \ $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/setuptools-$(PYTHON_SETUPTOOLS_VERSION)-py2.py3-none-any.whl @@ -180,7 +183,10 @@ endif # CONFIG_PACKAGE_python-setuptools ifdef CONFIG_PACKAGE_python-pip define Build/Compile/python-pip - $(STAGING_DIR_HOSTPKG)/bin/pip install \ + $(HOST_PYTHON_PIP) \ + --disable-pip-version-check \ + --cache-dir "$(DL_DIR)/pip-cache" \ + install \ --ignore-installed \ --root=$(PKG_BUILD_DIR)/install-pip --prefix=. \ $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/pip-$(PYTHON_PIP_VERSION)-py2.py3-none-any.whl diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile index d151459ed..6ae2add1b 100644 --- a/lang/python/python3/Makefile +++ b/lang/python/python3/Makefile @@ -174,7 +174,10 @@ endef ifdef CONFIG_PACKAGE_python3-setuptools define Build/Compile/python3-setuptools - $(STAGING_DIR_HOSTPKG)/bin/pip3 install \ + $(HOST_PYTHON3_PIP) \ + --disable-pip-version-check \ + --cache-dir "$(DL_DIR)/pip-cache" \ + install \ --ignore-installed \ --root=$(PKG_BUILD_DIR)/install-setuptools --prefix=. \ $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/setuptools-$(PYTHON3_SETUPTOOLS_VERSION)-py2.py3-none-any.whl @@ -184,7 +187,10 @@ endif # CONFIG_PACKAGE_python3-setuptools ifdef CONFIG_PACKAGE_python3-pip define Build/Compile/python3-pip - $(STAGING_DIR_HOSTPKG)/bin/pip3 install \ + $(HOST_PYTHON3_PIP) \ + --disable-pip-version-check \ + --cache-dir "$(DL_DIR)/pip-cache" \ + install \ --ignore-installed \ --root=$(PKG_BUILD_DIR)/install-pip --prefix=. \ $(PKG_BUILD_DIR)/Lib/ensurepip/_bundled/pip-$(PYTHON3_PIP_VERSION)-py2.py3-none-any.whl