From patchwork Mon Jun 16 15:11:10 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baruch Siach X-Patchwork-Id: 360165 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id E732F1400AA for ; Tue, 17 Jun 2014 01:11:46 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 955AD93308; Mon, 16 Jun 2014 15:11:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Y-5PdBBJ3o+4; Mon, 16 Jun 2014 15:11:42 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id C0F9687AC6; Mon, 16 Jun 2014 15:11:42 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 53C461C0FD1 for ; Mon, 16 Jun 2014 15:11:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 4DCE88820A for ; Mon, 16 Jun 2014 15:11:41 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fOJQ3twILP7n for ; Mon, 16 Jun 2014 15:11:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mx.tkos.co.il (guitar.tcltek.co.il [192.115.133.116]) by whitealder.osuosl.org (Postfix) with ESMTPS id 7C58786967 for ; Mon, 16 Jun 2014 15:11:38 +0000 (UTC) Received: from tarshish.tkos.co.il (unknown [10.0.8.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mx.tkos.co.il (Postfix) with ESMTPSA id 64A9D44013A; Mon, 16 Jun 2014 18:11:33 +0300 (IDT) From: Baruch Siach To: buildroot@busybox.net Date: Mon, 16 Jun 2014 18:11:10 +0300 Message-Id: X-Mailer: git-send-email 2.0.0 Subject: [Buildroot] [PATCH] dbus: bump to version 1.8.4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Upstream removed support for libxml2 as xml backend, select expat unconditionally. Signed-off-by: Baruch Siach --- package/dbus/Config.in | 23 +---------------------- package/dbus/dbus.mk | 13 +++---------- 2 files changed, 4 insertions(+), 32 deletions(-) diff --git a/package/dbus/Config.in b/package/dbus/Config.in index 97c9ee9acce6..653f7482f693 100644 --- a/package/dbus/Config.in +++ b/package/dbus/Config.in @@ -3,33 +3,12 @@ config BR2_PACKAGE_DBUS depends on BR2_TOOLCHAIN_HAS_THREADS # uses fork() depends on BR2_USE_MMU + select BR2_PACKAGE_EXPAT help The D-Bus message bus system. http://www.freedesktop.org/wiki/Software/dbus -if BR2_PACKAGE_DBUS - -choice - prompt "XML library to use" - default BR2_DBUS_EXPAT - help - Select the XML library to use with D-Bus. Select Expat - unless you have specific reasons for using libxml2 as - Expat is significant smaller. - - config BR2_DBUS_EXPAT - bool "Expat" - select BR2_PACKAGE_EXPAT - - config BR2_DBUS_LIBXML2 - bool "libxml2" - select BR2_PACKAGE_LIBXML2 - -endchoice - -endif - comment "dbus needs a toolchain w/ threads" depends on BR2_USE_MMU depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/dbus/dbus.mk b/package/dbus/dbus.mk index 4bcc9538a9db..f8824eee55c2 100644 --- a/package/dbus/dbus.mk +++ b/package/dbus/dbus.mk @@ -4,7 +4,7 @@ # ################################################################################ -DBUS_VERSION = 1.6.18 +DBUS_VERSION = 1.8.4 DBUS_SITE = http://dbus.freedesktop.org/releases/dbus DBUS_LICENSE = AFLv2.1 GPLv2+ DBUS_LICENSE_FILES = COPYING @@ -14,7 +14,7 @@ define DBUS_PERMISSIONS /usr/libexec/dbus-daemon-launch-helper f 4755 0 0 - - - - - endef -DBUS_DEPENDENCIES = host-pkgconf +DBUS_DEPENDENCIES = host-pkgconf expat DBUS_CONF_ENV = ac_cv_have_abstract_sockets=yes DBUS_CONF_OPT = --with-dbus-user=dbus \ @@ -27,6 +27,7 @@ DBUS_CONF_OPT = --with-dbus-user=dbus \ --disable-static \ --disable-dnotify \ --localstatedir=/var \ + --with-xml=expat \ --with-system-socket=/var/run/dbus/system_bus_socket \ --with-system-pid-file=/var/run/messagebus.pid @@ -43,14 +44,6 @@ ifeq ($(BR2_microblaze),y) DBUS_CONF_OPT += --disable-inotify endif -ifeq ($(BR2_DBUS_EXPAT),y) -DBUS_CONF_OPT += --with-xml=expat -DBUS_DEPENDENCIES += expat -else -DBUS_CONF_OPT += --with-xml=libxml -DBUS_DEPENDENCIES += libxml2 -endif - ifeq ($(BR2_PACKAGE_XLIB_LIBX11),y) DBUS_CONF_OPT += --with-x DBUS_DEPENDENCIES += xlib_libX11