From: Jeffery To <jeffery.to@gmail.com>
Date: Wed, 29 May 2019 14:03:18 +0000 (+0800)
Subject: python,python3: Disable user site-packages for host Python
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=87a31e49f77ea252e454eeb780fee8342119bab0;p=feed%2Fpackages.git

python,python3: Disable user site-packages for host Python

Normally, Python will include the user's site-packages directory
(~/.local/lib/python$(PYTHON_VERSION)/site-packages) in it's internal
search path for modules.

This disables this default inclusion for host Python.

This change is applied during Host/Configure instead of as a patch to
keep this setting unchanged for target Python.

Signed-off-by: Jeffery To <jeffery.to@gmail.com>
---

diff --git a/lang/python/python/Makefile b/lang/python/python/Makefile
index 979ccc7714..c59e6a940c 100644
--- a/lang/python/python/Makefile
+++ b/lang/python/python/Makefile
@@ -298,6 +298,11 @@ HOST_CONFIGURE_ARGS+= \
 	--with-ensurepip=install \
 	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/Makefile b/lang/python/python3/Makefile
index d151459ed8..d2aea17f64 100644
--- a/lang/python/python3/Makefile
+++ b/lang/python/python3/Makefile
@@ -292,6 +292,11 @@ HOST_CONFIGURE_ARGS+= \
 	--with-ensurepip=install \
 	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