]> code.ossystems Code Review - openembedded-core.git/commitdiff
libxkbcommon: Add PACKAGECONFIG for x11
authorMartin Jansa <martin.jansa@gmail.com>
Tue, 18 Feb 2014 11:05:03 +0000 (12:05 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Thu, 20 Feb 2014 14:28:03 +0000 (14:28 +0000)
* 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>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.0.bb

index 27263021a34b5344e4825d53a166540f9e203ec2..2ad544857fea10c3c04ed26bd3b8d7ddb8864799 100644 (file)
@@ -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"