[Buildroot] [git commit] package/dbus-python: drop python2 support

[Yann E. MORIN]

commit: https://git.buildroot.net/buildroot/commit/?id=cf47c53f80a6ab82971b70b5475ecc26beffeef7
branch: https://git.buildroot.net/buildroot/commit/?id=refs/heads/master

Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998 at free.fr>
---
 package/dbus-python/Config.in      |  8 +++-----
 package/dbus-python/dbus-python.mk | 28 ++++------------------------
 2 files changed, 7 insertions(+), 29 deletions(-)

diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index 4bfb59ed91..76453e168a 100644
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -3,16 +3,14 @@ config BR2_PACKAGE_DBUS_PYTHON
 	depends on BR2_USE_WCHAR # glib2
 	depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
 	depends on BR2_PACKAGE_DBUS
-	depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
+	depends on BR2_PACKAGE_PYTHON3
 	select BR2_PACKAGE_LIBGLIB2
-	# pyexpat: runtime dependency only
-	select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
-	select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
+	select BR2_PACKAGE_PYTHON3_PYEXPAT # runtime
 	help
 	  Python bindings for D-Bus
 
 	  http://dbus.freedesktop.org/doc/dbus-python/
 
 comment "dbus-python needs a toolchain w/ wchar, threads"
-	depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3)
+	depends on BR2_PACKAGE_DBUS && BR2_PACKAGE_PYTHON3
 	depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
diff --git a/package/dbus-python/dbus-python.mk b/package/dbus-python/dbus-python.mk
index 3e28aed25c..d9bb30ed67 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -9,40 +9,20 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python
 DBUS_PYTHON_INSTALL_STAGING = YES
 DBUS_PYTHON_LICENSE = MIT (dbus-python), AFL-2.1 or GPL-2.0+ (dbus-gmain)
 DBUS_PYTHON_LICENSE_FILES = COPYING dbus-gmain/COPYING
-DBUS_PYTHON_DEPENDENCIES = dbus libglib2
-HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2
+DBUS_PYTHON_DEPENDENCIES = dbus libglib2 python3 host-python3
+HOST_DBUS_PYTHON_DEPENDENCIES = host-dbus host-libglib2 host-python3
 
-ifeq ($(BR2_PACKAGE_PYTHON),y)
-DBUS_PYTHON_DEPENDENCIES += python host-python
-
-DBUS_PYTHON_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/bin/python2 \
-	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python2-config --includes`" \
-	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python2-config --ldflags`"
-
-HOST_DBUS_PYTHON_DEPENDENCIES += host-python
-
-HOST_DBUS_PYTHON_CONF_ENV += \
-	PYTHON=$(HOST_DIR)/bin/python2 \
-	PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python2-config --includes`" \
-	PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python2-config --ldflags`"
-else
-DBUS_PYTHON_DEPENDENCIES += python3 host-python3
-
-DBUS_PYTHON_CONF_ENV += \
+DBUS_PYTHON_CONF_ENV = \
 	PYTHON=$(HOST_DIR)/bin/python3 \
 	PYTHON_INCLUDES="`$(STAGING_DIR)/usr/bin/python3-config --includes`" \
 	PYTHON_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --ldflags`" \
 	PYTHON_EXTRA_LIBS="`$(STAGING_DIR)/usr/bin/python3-config --libs --embed`"
 
-HOST_DBUS_PYTHON_DEPENDENCIES += host-python3
-
-HOST_DBUS_PYTHON_CONF_ENV += \
+HOST_DBUS_PYTHON_CONF_ENV = \
 	PYTHON=$(HOST_DIR)/bin/python3 \
 	PYTHON_INCLUDES="`$(HOST_DIR)/usr/bin/python3-config --includes`" \
 	PYTHON_LIBS="`$(HOST_DIR)/usr/bin/python3-config --ldflags`" \
 	PYTHON_EXTRA_LIBS="`$(HOST_DIR)/usr/bin/python3-config --libs --embed`"
-endif
 
 $(eval $(autotools-package))
 $(eval $(host-autotools-package))