Merge pull request #9100 from jefferyto/isolate-host-python

python,python3: Better isolate host Python

diff --cc lang/python/python-package.mk
Simple merge

diff --cc lang/python/python/Makefile
index fcfca44af4dfa01fe75dea230e59c8546e2cca53,c59e6a940c6ec184728fdad785934b5f0e7f1c45..9782dabd6d97fc4c807b598c0facc2c0e9bc19ae
--- 1/lang/python/python/Makefile
--- 2/lang/python/python/Makefile
+++ b/lang/python/python/Makefile
@@@ -303,9 -295,14 +303,14 @@@ HOST_CONFIGURE_ARGS+= 
        --prefix=$(HOST_PYTHON_DIR) \
        --exec-prefix=$(HOST_PYTHON_DIR) \
        --with-system-expat=$(STAGING_DIR_HOSTPKG) \
 -      --with-ensurepip=install \
 +      --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 --cc lang/python/python3-package.mk
Simple merge

diff --cc lang/python/python3/Makefile
index 9ada7c2cfc31cf293b7501aed746d3a5f86c457f,d2aea17f64a576b81736c1937288737432daf39f..02300bae0a6f076642a1c9d261a36695be590434
--- 1/lang/python/python3/Makefile
--- 2/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@@ -297,9 -289,14 +297,14 @@@ HOST_CONFIGURE_ARGS+= 
        --prefix=$(HOST_PYTHON3_DIR) \
        --exec-prefix=$(HOST_PYTHON3_DIR) \
        --with-system-expat=$(STAGING_DIR_HOSTPKG) \
 -      --with-ensurepip=install \
 +      --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