gitolite/buildrootschalter
gitolite/buildrootschalter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

xserver_xorg-server: fix dbus/udev configure problem

Browse Source 
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 <spdawson@gmail.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Simon Dawson 2012-09-23 02:18:20 +00:00 committed by Peter Korsgaard
parent 31b45a8c72
commit 21a5f16edb
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
View File

@ -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)