| Message ID | 20161129143658.20619-1-fparent@baylibre.com |
|---|---|
| State | Accepted |
| Headers | show |
Am Tue, 29 Nov 2016 15:36:58 +0100 schrieb Fabien Parent: > 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. > > Signed-off-by: Fabien Parent > <fparent@baylibre.com> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> (compile-tested using defconfig from https://bugs.busybox.net/show_bug.cgi?id=9486) Fixes https://bugs.busybox.net/show_bug.cgi?id=9486
Hello, On Tue, 29 Nov 2016 15:36:58 +0100, Fabien Parent wrote: > diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > index 51c3efc..adad2a7 100644 > --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk > @@ -73,7 +73,8 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y) > XSERVER_XORG_SERVER_CONF_OPTS += \ > --with-systemd-daemon \ > --enable-systemd-logind > -XSERVER_XORG_SERVER_DEPENDENCIES += systemd > +XSERVER_XORG_SERVER_DEPENDENCIES += systemd \ > + xproto_dri2proto Indentation was a bit off here, so I've fixed that and applied. However, I have to say I'm not really happy with those very complicated/nasty dependencies of the X.org server that don't really make any sense. Why is dri2proto needed for systemd support? Also, what bothers me is that such missing dependencies cause some build failures, while the configure script should detect those dependencies and abort. It would be nice if we could track those issues and report them back upstream so that they can fix their configure script. Best regards, Thomas
diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index df3801c..9e1ee6f 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -48,6 +48,7 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XPROTO_XPROTO select BR2_PACKAGE_XUTIL_UTIL_MACROS select BR2_PACKAGE_XKEYBOARD_CONFIG + select BR2_PACKAGE_XPROTO_DRI2PROTO if BR2_PACKAGE_SYSTEMD help X.Org X server diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 51c3efc..adad2a7 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -73,7 +73,8 @@ ifeq ($(BR2_PACKAGE_SYSTEMD),y) XSERVER_XORG_SERVER_CONF_OPTS += \ --with-systemd-daemon \ --enable-systemd-logind -XSERVER_XORG_SERVER_DEPENDENCIES += systemd +XSERVER_XORG_SERVER_DEPENDENCIES += systemd \ + xproto_dri2proto else XSERVER_XORG_SERVER_CONF_OPTS += \ --without-systemd-daemon \
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. Signed-off-by: Fabien Parent <fparent@baylibre.com> --- package/x11r7/xserver_xorg-server/Config.in | 1 + package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-)