From mboxrd@z Thu Jan 1 00:00:00 1970 From: spdawson at gmail.com Date: Sun, 23 Sep 2012 13:18:20 +0100 Subject: [Buildroot] [PATCH v2] xserver_xorg-server: fix dbus/udev configure problem Message-ID: <1348402700-12259-1-git-send-email-spdawson@gmail.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: buildroot@busybox.net From: Simon Dawson If both the dbus and udev packages are selected, then the configure step for the xserver_xorg-server package fails as follows. configure: error: Hotplugging through both libudev and dbus/hal not allowed The configure script no longer allows both the --enable-config-dbus and --enable-config-udev options to be specified. This patch changes the xserver_xorg-server makefile to use udev in preference to dbus, when both are available. Signed-off-by: Simon Dawson --- v2: As suggested by Peter Korsgaard, prefer udev to dbus .../xserver_xorg-server/xserver_xorg-server.mk | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index a19122d..8018a89 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -104,16 +104,14 @@ XSERVER_XORG_SERVER_DEPENDENCIES += tslib XSERVER_XORG_SERVER_CONF_OPT += --enable-tslib LDFLAGS="-lts" endif +ifeq ($(BR2_PACKAGE_UDEV),y) +XSERVER_XORG_SERVER_DEPENDENCIES += udev +XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev +else ifeq ($(BR2_PACKAGE_DBUS),y) XSERVER_XORG_SERVER_DEPENDENCIES += dbus XSERVER_XORG_SERVER_CONF_OPT += --enable-config-dbus endif - -ifeq ($(BR2_PACKAGE_UDEV),y) -XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev -XSERVER_XORG_SERVER_DEPENDENCIES += udev -else -XSERVER_XORG_SERVER_CONF_OPT += --disable-config-udev endif ifeq ($(BR2_PACKAGE_FREETYPE),y) -- 1.7.9.5