changes.diff

--- a/package/Config.in
+++ b/package/Config.in
@@ -756,6 +756,7 @@ menu "External python modules"
 	source "package/python-docutils/Config.in"
 	source "package/python-dominate/Config.in"
 	source "package/python-dpkt/Config.in"
 	source "package/python-ecdsa/Config.in"
 	source "package/python-engineio/Config.in"
 	source "package/python-enum/Config.in"
@@ -765,6 +766,7 @@ menu "External python modules"
 	source "package/python-flask-jsonrpc/Config.in"
 	source "package/python-flask-login/Config.in"
 	source "package/python-flup/Config.in"
 	source "package/python-futures/Config.in"
 	source "package/python-gobject/Config.in"
 	source "package/python-gunicorn/Config.in"
@@ -805,6 +807,7 @@ menu "External python modules"
 	source "package/python-mbstrdecoder/Config.in"
 	source "package/python-meld3/Config.in"
 	source "package/python-mistune/Config.in"
 	source "package/python-msgpack/Config.in"
 	source "package/python-mutagen/Config.in"
 	source "package/python-mwclient/Config.in"
@@ -847,6 +850,7 @@ menu "External python modules"
 	source "package/python-pyinotify/Config.in"
 	source "package/python-pylibftdi/Config.in"
 	source "package/python-pylru/Config.in"
 	source "package/python-pymysql/Config.in"
 	source "package/python-pynacl/Config.in"
 	source "package/python-pyopenssl/Config.in"
diff --git a/package/python-autobahn/Config.in b/package/python-autobahn/Config.in
index 7e1429c..862da0a 100644
--- a/package/python-autobahn/Config.in
+++ b/package/python-autobahn/Config.in
@@ -1,7 +1,8 @@
 config BR2_PACKAGE_PYTHON_AUTOBAHN
 	bool "python-autobahn"
 	select BR2_PACKAGE_PYTHON_SIX # runtime
-	select BR2_PACKAGE_PYTHON_TXAIO # runtime
+  select BR2_PACKAGE_PYTHON_TXAIO # runtime
+  select BR2_PACKAGE_PYTHON_TWISTED if BR2_PACKAGE_PYTHON
 	help
 	  WebSocket client Hhh server library, WAMP real-time
 	  framework.
diff --git a/package/python-crossbar/Config.in b/package/python-crossbar/Config.in
index faec922..706a320 100644
--- a/package/python-crossbar/Config.in
+++ b/package/python-crossbar/Config.in
@@ -25,13 +25,14 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
 	select BR2_PACKAGE_PYTHON_SERVICE_IDENTITY
 	select BR2_PACKAGE_PYTHON_SETPROCTITLE
 	select BR2_PACKAGE_PYTHON_SETUPTOOLS
-	select BR2_PACKAGE_PYTHON_SHUTILWHICH if BR2_PACKAGE_PYTHON
+	select BR2_PACKAGE_PYTHON_SHUTILWHICH
 	select BR2_PACKAGE_PYTHON_TREQ
 	select BR2_PACKAGE_PYTHON_TWISTED
 	select BR2_PACKAGE_PYTHON_U_MSGPACK
 	select BR2_PACKAGE_PYTHON_UBJSON
 	select BR2_PACKAGE_PYTHON_WATCHDOG
 	select BR2_PACKAGE_PYTHON_WSACCEL
+  depends on BR2_TOOLCHAIN_USES_GLIBC
 	help
 	  Crossbar.io is an open-source WAMP application router that
 	  allows to build advanced applications from loosely-coupled
@@ -41,3 +42,6 @@ config BR2_PACKAGE_PYTHON_CROSSBAR
 
 comment "python-crossbar needs a toolchain w/ C++"
 	depends on !BR2_INSTALL_LIBSTDCPP
+
+comment "python-crossbar needs a glibc toolchain
+    depends on !BR2_TOOLCHAIN_USES_GLIBC
diff --git a/package/python-shutilwhich/Config.in b/package/python-shutilwhich/Config.in
index abdc8d7..a75a63b 100644
--- a/package/python-shutilwhich/Config.in
+++ b/package/python-shutilwhich/Config.in
@@ -1,6 +1,5 @@
 config BR2_PACKAGE_PYTHON_SHUTILWHICH
 	bool "python-shutilwhich"
-	depends on BR2_PACKAGE_PYTHON
 	help
 	  shutil.which for those not using Python 3.3 yet.
 
diff --git a/package/python/Config.in b/package/python/Config.in
index 054ccd2..6a448d9 100644
--- a/package/python/Config.in
+++ b/package/python/Config.in
@@ -73,6 +73,11 @@ config BR2_PACKAGE_PYTHON_READLINE
 	  readline module for Python (required for command-line
 	  editing in the Python shell).
 
+config BR2_PACKAGE_PYTHON_LIB2TO3
+	bool "lib2to3"
+	help
+	  module for automated code translation from Python 2 to 3
+
 config BR2_PACKAGE_PYTHON_SSL
 	bool "ssl"
 	select BR2_PACKAGE_OPENSSL
diff --git a/package/python/python.mk b/package/python/python.mk
index aa7917a..8621366 100644
--- a/package/python/python.mk
+++ b/package/python/python.mk
@@ -66,6 +66,10 @@ else
 PYTHON_CONF_OPTS += --disable-readline
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON_LIB2TO3),n)
+PYTHON_CONF_OPTS += --disable-lib2to3
+endif
+
 ifeq ($(BR2_PACKAGE_PYTHON_CURSES),y)
 PYTHON_DEPENDENCIES += ncurses
 else
@@ -160,7 +164,6 @@ PYTHON_CONF_OPTS += \
 	--with-system-ffi \
 	--disable-pydoc \
 	--disable-test-modules \
-	--disable-lib2to3 \
 	--disable-gdbm \
 	--disable-tk \
 	--disable-nis \
diff --git a/package/python3/Config.in b/package/python3/Config.in
index 35f57e6..e15868f 100644
--- a/package/python3/Config.in
+++ b/package/python3/Config.in
@@ -74,6 +74,11 @@ config BR2_PACKAGE_PYTHON3_READLINE
 	  readline module for Python3 (required for command-line
 	  editing in the Python shell).
 
+config BR2_PACKAGE_PYTHON3_LIB2TO3
+	bool "lib2to3"
+	help
+	  module for automated code translation from Python 2 to 3
+
 config BR2_PACKAGE_PYTHON3_SSL
 	bool "ssl"
 	select BR2_PACKAGE_OPENSSL
diff --git a/package/python3/python3.mk b/package/python3/python3.mk
index 1d2201e..599c4ad 100644
--- a/package/python3/python3.mk
+++ b/package/python3/python3.mk
@@ -57,6 +57,10 @@ else
 PYTHON3_CONF_OPTS += --disable-readline
 endif
 
+ifeq ($(BR2_PACKAGE_PYTHON3_LIB2TO3),n)
+PYTHON3_CONF_OPTS += --disable-lib2to3
+endif
+
 ifeq ($(BR2_PACKAGE_PYTHON3_CURSES),y)
 PYTHON3_DEPENDENCIES += ncurses
 else
@@ -153,7 +157,6 @@ PYTHON3_CONF_OPTS += \
 	--with-system-ffi \
 	--disable-pydoc \
 	--disable-test-modules \
-	--disable-lib2to3 \
 	--disable-tk \
 	--disable-nis \
 	--disable-idle3 \