From 30fd52a727061a73eabea1b1665c24f5649017d8 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Sat, 27 Dec 2014 17:22:29 +0100 Subject: package/libxkbcommon: fix builds with/without X11 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We need to explicitly disable X11 support when X11 is not available. Conversely, when it is, we need to add the required dependencies. Fixes a slew of autobuild failures: http://autobuild.buildroot.org/results/587/58794f894a4950b77e38d5fc877852d6cc507d8c/ http://autobuild.buildroot.org/results/927/92741f6b9b7909b226c200e453ac6cee8af5abd6/ http://autobuild.buildroot.org/results/51c/51cb09f7f267319948c685f905e29afe99f59589/ ... Signed-off-by: "Yann E. MORIN" Cc: Fatih Aşıcı Signed-off-by: Thomas Petazzoni --- package/libxkbcommon/Config.in | 1 + package/libxkbcommon/libxkbcommon.mk | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/package/libxkbcommon/Config.in b/package/libxkbcommon/Config.in index 0a52c6f43..4da12897f 100644 --- a/package/libxkbcommon/Config.in +++ b/package/libxkbcommon/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBXKBCOMMON bool "libxkbcommon" + select BR2_PACKAGE_LIBXCB if BR2_PACKAGE_XORG7 help xkbcommon is a keymap compiler and support library which processes a reduced subset of keymaps as defined by the XKB diff --git a/package/libxkbcommon/libxkbcommon.mk b/package/libxkbcommon/libxkbcommon.mk index 2d3050690..12d5f1614 100644 --- a/package/libxkbcommon/libxkbcommon.mk +++ b/package/libxkbcommon/libxkbcommon.mk @@ -15,4 +15,11 @@ LIBXKBCOMMON_DEPENDENCIES = host-bison host-flex # uses C99 features LIBXKBCOMMON_CONF_ENV = CFLAGS="$(TARGET_CFLAGS) -std=gnu99" +ifeq ($(BR2_PACKAGE_XORG7),y) +LIBXKBCOMMON_CONF_OPTS += --enable-x11 +LIBXKBCOMMON_DEPENDENCIES += libxcb +else +LIBXKBCOMMON_CONF_OPTS += --disable-x11 +endif + $(eval $(autotools-package)) -- cgit v1.2.3