From: Rosen Penev <rosenp@gmail.com>
Date: Mon, 3 Jun 2019 09:11:20 +0000 (-0700)
Subject: Merge pull request #9100 from jefferyto/isolate-host-python
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=15a06064034478ab65f0c19dad3e043578226a45;p=feed%2Fpackages.git

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

python,python3: Better isolate host Python
---

15a06064034478ab65f0c19dad3e043578226a45
diff --cc lang/python/python/Makefile
index fcfca44af4,c59e6a940c..9782dabd6d
--- a/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/Makefile
index 9ada7c2cfc,d2aea17f64..02300bae0a
--- a/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