6 files changed, 30 insertions, 22 deletions
diff --git a/lang/python/python-host.mk b/lang/python/python-host.mk
index eb58c557e..44ecbbf8d 100644
--- a/lang/python/python-host.mk
+++ b/lang/python/python-host.mk
@@ -71,16 +71,15 @@ endef
 
 # Note: I shamelessly copied this from Yousong's logic (from python-packages);
 HOST_PYTHON_PIP:=$(STAGING_DIR_HOSTPKG)/bin/pip$(PYTHON_VERSION)
-define host_python_pip_install
-	$(call host_python_settings) \
-	$(HOST_PYTHON_PIP) install \
-		--root=$(1) \
-		--prefix=$(2) \
-		$(3)
-endef
 
-define host_python_pip_install_host
-$(call host_python_pip_install,$(STAGING_DIR_HOSTPKG),"",$(1))
+# $(1) => packages to install
+define Build/Compile/HostPyPipInstall
+	$(call host_python_settings) \
+	$(HOST_PYTHON_PIP) \
+		--disable-pip-version-check \
+		--cache-dir "$(DL_DIR)/pip-cache" \
+		install \
+		$(1)
 endef
 
 # $(1) => build subdir
diff --git a/lang/python/python-package.mk b/lang/python/python-package.mk
index 4cb3dbbd8..272aae44f 100644
--- a/lang/python/python-package.mk
+++ b/lang/python/python-package.mk
@@ -125,8 +125,8 @@ PYTHON_PKG_SETUP_ARGS ?= --single-version-externally-managed
 PYTHON_PKG_SETUP_VARS ?=
 
 define PyBuild/Compile/Default
-	$(foreach pkg,$(HOST_PYTHON_PACKAGE_BUILD_DEPENDS),
-		$(call host_python_pip_install_host,$(pkg))
+	$(if $(HOST_PYTHON_PACKAGE_BUILD_DEPENDS),
+		$(call Build/Compile/HostPyPipInstall,$(HOST_PYTHON_PACKAGE_BUILD_DEPENDS))
 	)
 	$(call Build/Compile/PyMod, \
 		$(PYTHON_PKG_SETUP_DIR), \
diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile
index fcfca44af..9782dabd6 100644
--- a/lang/python/python/Makefile
+++ b/lang/python/python/Makefile
@@ -306,6 +306,11 @@ HOST_CONFIGURE_ARGS+= \
 	--with-ensurepip=upgrade \
 	CONFIG_SITE=
 
+define Host/Configure
+	$(SED) 's/^ENABLE_USER_SITE = None$$$$/ENABLE_USER_SITE = False/' $(HOST_BUILD_DIR)/Lib/site.py
+	$(call Host/Configure/Default)
+endef
+
 define Host/Compile
 	$(call Host/Compile/Default,python Parser/pgen sharedmods)
 endef
diff --git a/lang/python/python3-host.mk b/lang/python/python3-host.mk
index 71ae09362..403d0d282 100644
--- a/lang/python/python3-host.mk
+++ b/lang/python/python3-host.mk
@@ -71,16 +71,15 @@ endef
 
 # Note: I shamelessly copied this from Yousong's logic (from python-packages);
 HOST_PYTHON3_PIP:=$(STAGING_DIR_HOSTPKG)/bin/pip$(PYTHON3_VERSION)
-define host_python3_pip_install
-	$(call host_python3_settings) \
-	$(HOST_PYTHON3_PIP) install \
-		--root=$(1) \
-		--prefix=$(2) \
-		$(3)
-endef
 
-define host_python3_pip_install_host
-$(call host_python3_pip_install,$(STAGING_DIR_HOSTPKG),"",$(1))
+# $(1) => packages to install
+define Build/Compile/HostPy3PipInstall
+	$(call host_python3_settings) \
+	$(HOST_PYTHON3_PIP) \
+		--disable-pip-version-check \
+		--cache-dir "$(DL_DIR)/pip-cache" \
+		install \
+		$(1)
 endef
 
 # $(1) => build subdir
diff --git a/lang/python/python3-package.mk b/lang/python/python3-package.mk
index e38bbf67e..6e163e099 100644
--- a/lang/python/python3-package.mk
+++ b/lang/python/python3-package.mk
@@ -124,8 +124,8 @@ PYTHON3_PKG_SETUP_ARGS ?= --single-version-externally-managed
 PYTHON3_PKG_SETUP_VARS ?=
 
 define Py3Build/Compile/Default
-	$(foreach pkg,$(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS),
-		$(call host_python3_pip_install_host,$(pkg))
+	$(if $(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS),
+		$(call Build/Compile/HostPy3PipInstall,$(HOST_PYTHON3_PACKAGE_BUILD_DEPENDS))
 	)
 	$(call Build/Compile/Py3Mod, \
 		$(PYTHON3_PKG_SETUP_DIR), \
diff --git a/lang/python/python3/Makefile b/lang/python/python3/Makefile
index 9ada7c2cf..02300bae0 100644
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -300,6 +300,11 @@ HOST_CONFIGURE_ARGS+= \
 	--with-ensurepip=upgrade \
 	CONFIG_SITE=
 
+define Host/Configure
+	$(SED) 's/^ENABLE_USER_SITE = None$$$$/ENABLE_USER_SITE = False/' $(HOST_BUILD_DIR)/Lib/site.py
+	$(call Host/Configure/Default)
+endef
+
 define Host/Compile
 	+$(HOST_MAKE_VARS) $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) python Parser/pgen
 	+$(HOST_MAKE_VARS) $(MAKE) $(HOST_JOBS) -C $(HOST_BUILD_DIR) sharedmods