Patchwork libxkbcommon: Add PACKAGECONFIG for x11

login
register
mail settings
Submitter Martin Jansa
Date Feb. 18, 2014, 11:05 a.m.
Message ID <1392721503-27383-1-git-send-email-Martin.Jansa@gmail.com>
Download mbox | patch
Permalink /patch/66909/
State New
Headers show

Comments

Martin Jansa - Feb. 18, 2014, 11:05 a.m.
* allow to explicitly disable x11 with --disable-x11, otherwise
  do_configure fails for DISTROs without x11 in DISTRO_FEATURES:
  | No package 'xcb-xkb' found
  | configure:18763: $? = 1
  | configure:18777: result: no
  | No package 'xcb' found
  | No package 'xcb-xkb' found
  | configure:18793: error: xkbcommon-x11 requires xcb-xkb >= 1.10 which
    was not found. You can disable X11 support with --disable-x11.

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
---
 meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb | 3 +++
 1 file changed, 3 insertions(+)

Patch

diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb
index 2726302..2ad5448 100644
--- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb
+++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb
@@ -15,3 +15,6 @@  SRC_URI[sha256sum] = "2dc018e830d1befaf4822615204138318da3fff0112f78f3a7c638fa61
 inherit autotools pkgconfig
 
 EXTRA_OECONF = "--disable-docs"
+
+PACKAGECONFIG ?= "${@base_contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}"
+PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,libxcb"