aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernd Kuhls <bernd.kuhls@t-online.de>2014-10-08 22:26:35 +0200
committerGravatar Peter Korsgaard <peter@korsgaard.com>2014-10-12 17:16:00 +0200
commit9e33687a13c554d6a1222d038dd159c533eacc27 (patch)
tree1dd18b06c068cf805b93fcc32dfd08b7499c5767
parent725efef8313ae5591bb497fec3aa7e62717af9a2 (diff)
downloadbuildroot-9e33687a13c554d6a1222d038dd159c533eacc27.tar.gz
buildroot-9e33687a13c554d6a1222d038dd159c533eacc27.tar.bz2
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 <bernd.kuhls@t-online.de> Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/x11r7/xserver_xorg-server/xserver_xorg-server.mk4
1 files changed, 3 insertions, 1 deletions
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