All of lore.kernel.org
 help / color / mirror / Atom feed
* [Buildroot] [PATCH] xserver_xorg-server: fix dbus/udev configure problem
@ 2012-09-23 11:32 spdawson at gmail.com
  2012-09-23 11:55 ` Peter Korsgaard
  0 siblings, 1 reply; 3+ messages in thread
From: spdawson at gmail.com @ 2012-09-23 11:32 UTC (permalink / raw)
  To: buildroot

From: Simon Dawson <spdawson@gmail.com>

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 dbus in preference
to udev, when both are available.

Signed-off-by: Simon Dawson <spdawson@gmail.com>
---
 .../xserver_xorg-server/xserver_xorg-server.mk     |    8 +++-----
 1 file changed, 3 insertions(+), 5 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..90ac8a0 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -107,13 +107,11 @@ endif
 ifeq ($(BR2_PACKAGE_DBUS),y)
 XSERVER_XORG_SERVER_DEPENDENCIES += dbus
 XSERVER_XORG_SERVER_CONF_OPT += --enable-config-dbus
-endif
-
+else
 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
+XSERVER_XORG_SERVER_CONF_OPT += --enable-config-udev
+endif
 endif
 
 ifeq ($(BR2_PACKAGE_FREETYPE),y)
-- 
1.7.9.5

^ permalink raw reply related	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] xserver_xorg-server: fix dbus/udev configure problem
  2012-09-23 11:32 [Buildroot] [PATCH] xserver_xorg-server: fix dbus/udev configure problem spdawson at gmail.com
@ 2012-09-23 11:55 ` Peter Korsgaard
  2012-09-23 12:13   ` Simon Dawson
  0 siblings, 1 reply; 3+ messages in thread
From: Peter Korsgaard @ 2012-09-23 11:55 UTC (permalink / raw)
  To: buildroot

>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:

 spdawson> From: Simon Dawson <spdawson@gmail.com>

 spdawson> If both the dbus and udev packages are selected, then the
 spdawson> configure step for the xserver_xorg-server package fails as
 spdawson> follows.

 spdawson>   configure: error: Hotplugging through both libudev and dbus/hal not allowed

 spdawson> The configure script no longer allows both the
 spdawson> --enable-config-dbus and --enable-config-udev options to be
 spdawson> specified.

 spdawson> This patch changes the xserver_xorg-server makefile to use
 spdawson> dbus in preference to udev, when both are available.

Thanks, but isn't udev the "preferred" backend nowadays? D-Bus defaults
to no.

-- 
Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

* [Buildroot] [PATCH] xserver_xorg-server: fix dbus/udev configure problem
  2012-09-23 11:55 ` Peter Korsgaard
@ 2012-09-23 12:13   ` Simon Dawson
  0 siblings, 0 replies; 3+ messages in thread
From: Simon Dawson @ 2012-09-23 12:13 UTC (permalink / raw)
  To: buildroot

Okay Peter; I'll reverse the logic then.

Simon.

On 23 September 2012 12:55, Peter Korsgaard <jacmet@uclibc.org> wrote:
>>>>>> "spdawson" == spdawson  <spdawson@gmail.com> writes:
>
>  spdawson> From: Simon Dawson <spdawson@gmail.com>
>
>  spdawson> If both the dbus and udev packages are selected, then the
>  spdawson> configure step for the xserver_xorg-server package fails as
>  spdawson> follows.
>
>  spdawson>   configure: error: Hotplugging through both libudev and dbus/hal not allowed
>
>  spdawson> The configure script no longer allows both the
>  spdawson> --enable-config-dbus and --enable-config-udev options to be
>  spdawson> specified.
>
>  spdawson> This patch changes the xserver_xorg-server makefile to use
>  spdawson> dbus in preference to udev, when both are available.
>
> Thanks, but isn't udev the "preferred" backend nowadays? D-Bus defaults
> to no.
>
> --
> Bye, Peter Korsgaard

^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2012-09-23 12:13 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-09-23 11:32 [Buildroot] [PATCH] xserver_xorg-server: fix dbus/udev configure problem spdawson at gmail.com
2012-09-23 11:55 ` Peter Korsgaard
2012-09-23 12:13   ` Simon Dawson

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.