| Message ID | 1427834462-23412-1-git-send-email-sagaert.johan@proximus.be |
|---|---|
| State | Accepted |
| Headers | show |
Dear Sagaert Johan, On Tue, 31 Mar 2015 22:41:02 +0200, Sagaert Johan wrote: > > Signed-off-by: Sagaert Johan <sagaert.johan@proximus.be> Applied, after tweaking the commit log to include the name of the affected package. Sagaert: all commit title should have the form: <package>: <description> Note that systemd-logind support actually doesn't require systemd, it only needs D-Bus and udev. But since it certainly doesn't make sense without systemd in the system, I believe your patch is a good enough solution. Thanks! Thomas
diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index bb5381c..2bab0f5 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -64,6 +64,17 @@ XSERVER_XORG_SERVER_CONF_OPTS = \ --with-fontrootdir=/usr/share/fonts/X11/ \ --$(if $(BR2_PACKAGE_XSERVER_XORG_SERVER_XVFB),en,dis)able-xvfb +ifeq ($(BR2_PACKAGE_SYSTEMD),y) +XSERVER_XORG_CONF_OPTS += \ + --with-systemd-daemon \ + --enable-systemd-logind +XSERVER_XORG_SERVER_DEPENDENCIES += systemd +else +XSERVER_XORG_CONF_OPTS += \ + --without-systemd-daemon \ + --disable-systemd-logind +endif + ifeq ($(BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR),y) XSERVER_XORG_SERVER_CONF_OPTS += --enable-xorg XSERVER_XORG_SERVER_DEPENDENCIES += libpciaccess
Signed-off-by: Sagaert Johan <sagaert.johan@proximus.be> --- Patch v2->v3 : added dependency as suggested by Arnout (configure does pkg-config check for libsystemd-daemon) --- Patch v1->v2 : added else clause as suggested by Thomas. --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 11 +++++++++++ 1 file changed, 11 insertions(+)