[Buildroot] [git commit branch/next] dbus-python: add python3 support
Thomas Petazzoni
thomas.petazzoni at free-electrons.com
Sat Nov 22 18:15:11 UTC 2014
commit: http://git.buildroot.net/buildroot/commit/?id=d1935562e83ef0d221929d935cf3d673435c85cb
branch: http://git.buildroot.net/buildroot/commit/?id=refs/heads/next
[Thomas: update the dependencies of the comment to take into account
that we can now also build with Python 3.]
Signed-off-by: Peter Korsgaard <peter at korsgaard.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni at free-electrons.com>
---
package/dbus-python/Config.in | 7 ++++---
package/dbus-python/dbus-python.mk | 17 ++++++++++++++---
2 files changed, 18 insertions(+), 6 deletions(-)
diff --git a/package/dbus-python/Config.in b/package/dbus-python/Config.in
index a38d277..3327263 100644
--- a/package/dbus-python/Config.in
+++ b/package/dbus-python/Config.in
@@ -3,15 +3,16 @@ 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
+ depends on BR2_PACKAGE_PYTHON || BR2_PACKAGE_PYTHON3
select BR2_PACKAGE_DBUS_GLIB
# pyexpat: runtime dependency only
- select BR2_PACKAGE_PYTHON_PYEXPAT
+ select BR2_PACKAGE_PYTHON_PYEXPAT if BR2_PACKAGE_PYTHON
+ select BR2_PACKAGE_PYTHON3_PYEXPAT if BR2_PACKAGE_PYTHON3
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
+ depends on BR2_PACKAGE_DBUS && (BR2_PACKAGE_PYTHON || 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 bc57689..1637406 100644
--- a/package/dbus-python/dbus-python.mk
+++ b/package/dbus-python/dbus-python.mk
@@ -9,14 +9,25 @@ DBUS_PYTHON_SITE = http://dbus.freedesktop.org/releases/dbus-python
DBUS_PYTHON_INSTALL_STAGING = YES
DBUS_PYTHON_LICENSE = MIT
DBUS_PYTHON_LICENSE_FILES = COPYING
+DBUS_PYTHON_DEPENDENCIES = dbus-glib
+DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs
+
+ifeq ($(BR2_PACKAGE_PYTHON),y)
+DBUS_PYTHON_DEPENDENCIES += python host-python
-DBUS_PYTHON_CONF_ENV = \
+DBUS_PYTHON_CONF_ENV += \
PYTHON=$(HOST_DIR)/usr/bin/python2 \
PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python2-config --includes)" \
PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python2-config --ldflags)"
+else
+DBUS_PYTHON_DEPENDENCIES += python3 host-python3
+
+DBUS_PYTHON_CONF_ENV += \
+ PYTHON=$(HOST_DIR)/usr/bin/python3 \
+ PYTHON_INCLUDES="$(shell $(STAGING_DIR)/usr/bin/python3-config --includes)" \
+ PYTHON_LIBS="$(shell $(STAGING_DIR)/usr/bin/python3-config --ldflags)"
+endif
-DBUS_PYTHON_CONF_OPTS = --disable-html-docs --disable-api-docs
-DBUS_PYTHON_DEPENDENCIES = dbus-glib python host-python
$(eval $(autotools-package))
More information about the buildroot
mailing list