mirror/buildroot
1
0
Fork 0
mirror of https://gitlab.com/buildroot.org/buildroot.git synced 2026-10-01 06:21:56 -09:00
Code Issues Packages Projects Releases Wiki Activity

xorg-server: add dependency on dri2proto when systemd is built

Browse Source 
When systemd is selected, xorg-server must have config-udev-kms
enabled in order to build correctly, but it won't be the case if
BR2_PACKAGE_XPROTO_DRI2PROTO is not part of the build.

Add BR2_PACKAGE_XPROTO_DRI2PROTO as a dependency of xorg-xserver
only when systemd is part of the build.

Fixes bug #9486.

Signed-off-by: Fabien Parent <fparent@baylibre.com>
Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
(cherry picked from commit cd4af31dd8)
This commit is contained in:
Fabien Parent
2016-11-29 15:36:58 +01:00
committed by Peter Korsgaard
parent 7dbd36d931
commit 34bd0869b6
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
package/x11r7/xserver_xorg-server/Config.in
View File

@@ -48,6 +48,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER
select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XPROTO_XPROTO
select BR2_PACKAGE_XUTIL_UTIL_MACROS select BR2_PACKAGE_XUTIL_UTIL_MACROS
select BR2_PACKAGE_XKEYBOARD_CONFIG select BR2_PACKAGE_XKEYBOARD_CONFIG
select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_SYSTEMD
help help
X.Org X server X.Org X server

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

@@ -73,7 +73,9 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y)
XSERVER_XORG_SERVER_CONF_OPTS += \ XSERVER_XORG_SERVER_CONF_OPTS += \
--with-systemd-daemon \ --with-systemd-daemon \
--enable-systemd-logind --enable-systemd-logind
XSERVER_XORG_SERVER_DEPENDENCIES += systemd XSERVER_XORG_SERVER_DEPENDENCIES += \
systemd \
xproto_dri2proto
else else
XSERVER_XORG_SERVER_CONF_OPTS += \ XSERVER_XORG_SERVER_CONF_OPTS += \
--without-systemd-daemon \ --without-systemd-daemon \