From fe13eac8c8a5c5af84a8bbbc8f08a5e39543272a Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 3 Jun 2015 22:41:45 +0200 Subject: [PATCH] package/matchbox: xlib-libXcursor is an optional dependency matchbox selects xlib-libXcursor, but does not build-depend on it. But xlib-libXcursor is only an optional dependency. Fix that by removing the select, and properly build-depend on it when it is enabled. Signed-off-by: "Yann E. MORIN" Reviewed-by: Arnout Vandecappelle (Essensium/Mind) Signed-off-by: Thomas Petazzoni --- package/matchbox/Config.in | 1 - package/matchbox/matchbox.mk | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index 0c7e5ea9f9..3a9f118f4a 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -4,7 +4,6 @@ menuconfig BR2_PACKAGE_MATCHBOX depends on BR2_USE_MMU # fork() select BR2_PACKAGE_FONTCONFIG select BR2_PACKAGE_EXPAT - select BR2_PACKAGE_XLIB_LIBXCURSOR select BR2_PACKAGE_MATCHBOX_LIB help Matchbox is an Open Source base environment for the X Window diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk index 1abcfd8482..3b6a0eb388 100644 --- a/package/matchbox/matchbox.mk +++ b/package/matchbox/matchbox.mk @@ -35,4 +35,8 @@ else MATCHBOX_CONF_OPTS += --disable-session endif +ifeq ($(BR2_PACKAGE_XLIB_LIBXCURSOR),y) +MATCHBOX_DEPENDENCIES += xlib_libXcursor +endif + $(eval $(autotools-package)) -- 2.30.2