summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJérôme Pouiller <jezz@sysmic.org>2016-11-14 14:22:38 +0100
committerThomas Petazzoni <thomas.petazzoni@free-electrons.com>2016-12-17 16:52:38 +0100
commitc01efc5ab92f1c5652f4876c09b169db3a741455 (patch)
tree8e48247289babc6e957d984a4f81799ef51d106d
parent30128ef4d017add8e8300df43a983001a67455d8 (diff)
downloadbuildroot-c01efc5ab92f1c5652f4876c09b169db3a741455.tar.gz
buildroot-c01efc5ab92f1c5652f4876c09b169db3a741455.zip
xserver_xorg-server: fix dependency with dbus
If dbus and udev are enabled. Xorg link with both: $ arm-linux-readelf -d usr/bin/X | grep NEEDED 0x00000001 (NEEDED) Shared library: [libdbus-1.so.3] 0x00000001 (NEEDED) Shared library: [libpthread.so.0] 0x00000001 (NEEDED) Shared library: [libudev.so.1] [...] Signed-off-by: Jérôme Pouiller <jezz@sysmic.org> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
index 30fb05bedb..6519af3d73 100644
--- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
+++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk
@@ -168,12 +168,12 @@ XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-udev-kms
else
XSERVER_XORG_SERVER_CONF_OPTS += --disable-config-udev-kms
endif
-else
+endif
+
ifeq ($(BR2_PACKAGE_DBUS),y)
XSERVER_XORG_SERVER_DEPENDENCIES += dbus
XSERVER_XORG_SERVER_CONF_OPTS += --enable-config-dbus
endif
-endif
ifeq ($(BR2_PACKAGE_FREETYPE),y)
XSERVER_XORG_SERVER_DEPENDENCIES += freetype
OpenPOWER on IntegriCloud