From 9e33687a13c554d6a1222d038dd159c533eacc27 Mon Sep 17 00:00:00 2001 From: Bernd Kuhls Date: Wed, 8 Oct 2014 22:26:35 +0200 Subject: [PATCH] xserver_xorg-server: Add optional package xlib_libXcomposite as dependency Make sure that xlib_libXcomposite is build before xserver_xorg-server. With this defconfig BR2_TOOLCHAIN_EXTERNAL=y BR2_PACKAGE_XORG7=y BR2_PACKAGE_XSERVER_XORG_SERVER=y BR2_PACKAGE_XSERVER_XORG_SERVER_MODULAR=y BR2_PACKAGE_XLIB_LIBXCOMPOSITE=y and "make xserver_xorg-server" the package xlib_libXcomposite was ignored. Signed-off-by: Bernd Kuhls Signed-off-by: Peter Korsgaard --- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index f9522ed928..c27dd8065a 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -161,7 +161,9 @@ ifneq ($(BR2_PACKAGE_XLIB_LIBXVMC),y) XSERVER_XORG_SERVER_CONF_OPTS += --disable-xvmc endif -ifneq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) +ifeq ($(BR2_PACKAGE_XLIB_LIBXCOMPOSITE),y) +XSERVER_XORG_SERVER_DEPENDENCIES += xlib_libXcomposite +else XSERVER_XORG_SERVER_CONF_OPTS += --disable-composite endif