From: Alexandru Ardelean <redacted>
Date: Sat, 14 Mar 2015 14:13:51 +0000 (+0200)
Subject: python3: revert puting the encodings folder into a python3-codecs
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=12bba3562773a278dca26c3e7dcf4ee8b6ce0866;p=openwrt-packages.git

python3: revert puting the encodings folder into a python3-codecs

Some notes about the 'encodings' module, which is about 1.7 MB.
Unfortunately that one cannot be moved into the 'python3-codecs'
package, because Python tries to load up all available encodings
at startup.
Some efforts to add a dummy folder/python file have failed so far,
since there's a C code (Python/codecs.c) that tries to evaluate that
all encodings (in the encodings folder/module) are valid.

Basically the encodings module is a repository of encodings,
and it seemst there are quite a few of them.

Maybe a request to upstream Python would work for this, to
make encodings a bit more decoupled from the interpreter.

Signed-off-by: Alexandru Ardelean <redacted>
---

diff --git a/lang/python3/Makefile b/lang/python3/Makefile
index 1fb001aa0..1cd18750d 100644
--- a/lang/python3/Makefile
+++ b/lang/python3/Makefile
@@ -156,6 +156,7 @@ define Build/InstallDev
 endef
 
 PYTHON3_BASE_LIB_FILES:= \
+	/usr/lib/python$(PYTHON_VERSION)/encodings \
 	/usr/lib/python$(PYTHON_VERSION)/_collections_abc.py \
 	/usr/lib/python$(PYTHON_VERSION)/_sitebuiltins.py \
 	/usr/lib/python$(PYTHON_VERSION)/_sysconfigdata.py \
diff --git a/lang/python3/files/python3-package-codecs.mk b/lang/python3/files/python3-package-codecs.mk
index 67c3ee51a..66101e1fb 100644
--- a/lang/python3/files/python3-package-codecs.mk
+++ b/lang/python3/files/python3-package-codecs.mk
@@ -12,7 +12,6 @@ $(call Package/python3/Default)
 endef
 
 $(eval $(call Py3BasePackage,python3-codecs, \
-	/usr/lib/python$(PYTHON3_VERSION)/encodings \
 	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_cn.$(PYTHON3_SO_SUFFIX) \
 	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_hk.$(PYTHON3_SO_SUFFIX) \
 	/usr/lib/python$(PYTHON3_VERSION)/lib-dynload/_codecs_iso2022.$(PYTHON3_SO_SUFFIX) \