summaryrefslogtreecommitdiffstats
path: root/rules/dbus.make
diff options
context:
space:
mode:
authorRobert Schwebel <r.schwebel@pengutronix.de>2012-06-12 11:34:58 +0200
committerRobert Schwebel <r.schwebel@pengutronix.de>2012-06-12 12:19:21 +0200
commit304fab8993538b0ab4134756a6335862b90c56f0 (patch)
tree36f8037bae6cc0d6c0f8a88ca3c9ba328b0b3c2d /rules/dbus.make
parentb5cad02dc0c8f4ef19ce13b697626d9ce7affeb2 (diff)
downloadptxdist-304fab8993538b0ab4134756a6335862b90c56f0.tar.gz
ptxdist-304fab8993538b0ab4134756a6335862b90c56f0.tar.xz
dbus: version bump 1.4.14 -> 1.6.0
Signed-off-by: Robert Schwebel <r.schwebel@pengutronix.de>
Diffstat (limited to 'rules/dbus.make')
-rw-r--r--rules/dbus.make11
1 files changed, 8 insertions, 3 deletions
diff --git a/rules/dbus.make b/rules/dbus.make
index ed4a1269e..8adbec7a9 100644
--- a/rules/dbus.make
+++ b/rules/dbus.make
@@ -18,8 +18,8 @@ PACKAGES-$(PTXCONF_DBUS) += dbus
#
# Paths and names
#
-DBUS_VERSION := 1.4.14
-DBUS_MD5 := ae6de2562a57516cfabaf56903375ba9
+DBUS_VERSION := 1.6.0
+DBUS_MD5 := 16dcae2dd0c76e398381601ac9acdec4
DBUS := dbus-$(DBUS_VERSION)
DBUS_SUFFIX := tar.gz
DBUS_URL := http://dbus.freedesktop.org/releases/dbus/$(DBUS).$(DBUS_SUFFIX)
@@ -63,7 +63,12 @@ DBUS_AUTOCONF := \
--with-dbus-user=$(PTXCONF_DBUS_USER) \
--$(call ptx/endis, PTXCONF_DBUS_SELINUX)-selinux \
--with-xml=$(DBUS_XML-y) \
- --with-systemdsystemunitdir=/lib/systemd/system
+ --with-systemdsystemunitdir=/lib/systemd/system \
+ --$(call ptx/endis, PTXCONF_INITMETHOD_SYSTEMD)-systemd \
+ --with-dbus-session-bus-default-address=nonce-tcp: \
+ --enable-epoll \
+ --without-valgrind \
+ --disable-stats
ifdef PTXCONF_DBUS_X
DBUS_AUTOCONF += --with-x=$(SYSROOT)/usr