From: Stefan Teodorescu <stefanl.teodorescu@gmail.com>
Date: Thu, 24 Oct 2019 14:29:46 +0000 (+0300)
Subject: Enable bzip2 extension
X-Git-Tag: RELEASE-0.6~5
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=4969f185deb9d8d257b5611f0d08594b517323e7;p=unikraft%2Flibs%2Fpython3.git

Enable bzip2 extension

Unit test test_bz2 now passes successfully.

Signed-off-by: Stefan Teodorescu <stefanl.teodorescu@gmail.com>
Reviewed-by: Costin Lupu <costin.lupu@cs.pub.ro>
---

diff --git a/Config.uk b/Config.uk
index 095a063..1bdaef2 100644
--- a/Config.uk
+++ b/Config.uk
@@ -41,6 +41,11 @@ menuconfig LIBPYTHON3_EXTENSIONS
 	bool "Extensions"
 	default n
 
+if LIBBZIP2
+config LIBPYTHON3_EXTENSION_BZIP2
+	bool "bzip2"
+	default y
+endif
 if LIBPYTHON3_EXTENSIONS
 config LIBPYTHON3_EXTENSION_EXPAT
 	bool "Expat XML parser"
diff --git a/Makefile.uk b/Makefile.uk
index ed28f04..39c91e1 100644
--- a/Makefile.uk
+++ b/Makefile.uk
@@ -313,7 +313,7 @@ else
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/_blake2/impl/blake2b-ref.c
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/_blake2/impl/blake2s-ref.c
 endif
-#LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/_bz2module.c
+LIBPYTHON3_EXTENSIONS_SRCS-$(CONFIG_LIBPYTHON3_EXTENSION_BZIP2) += $(LIBPYTHON3_SRC)/Modules/_bz2module.c
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/cjkcodecs/_codecs_cn.c
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/cjkcodecs/_codecs_hk.c
 LIBPYTHON3_EXTENSIONS_SRCS-y += $(LIBPYTHON3_SRC)/Modules/cjkcodecs/_codecs_iso2022.c
diff --git a/modules_config.c b/modules_config.c
index 9e408dc..7772d00 100644
--- a/modules_config.c
+++ b/modules_config.c
@@ -215,7 +215,9 @@ struct _inittab _PyImport_Inittab[] = {
     {"binascii", PyInit_binascii},
     {"_bisect", PyInit__bisect},
     {"_blake2", PyInit__blake2},
-//    {"_bz2", PyInit__bz2},
+#if CONFIG_LIBPYTHON3_EXTENSION_BZIP2
+    {"_bz2", PyInit__bz2},
+#endif
     {"cmath", PyInit_cmath},
     {"_codecs", PyInit__codecs},
     {"_collections", PyInit__collections},