diff options
| author | Ross Burton <ross.burton@intel.com> | 2016-03-14 20:35:35 +0000 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-03-15 11:29:04 +0000 |
| commit | 269c2bd717b26d9b8efcfcc0d7e9a832940a4279 (patch) | |
| tree | 5d1a5ed2c8865e8358df3f36fbd8ec35c3f78e1e /meta | |
| parent | 1a51bb69b7600cbe6da7928d46e0ea058a14ccde (diff) | |
| download | poky-269c2bd717b26d9b8efcfcc0d7e9a832940a4279.tar.gz | |
xorg-lib: allow native building without x11 DISTRO_FEATURES
The Xorg libraries use REQUIRED_DISTRO_FEATURES to stop building on
distributions without the x11 feature but this stops people building native
tooling that uses libX11, such as libsdl-native.
(From OE-Core rev: f2970211690be3cb99ef7404f98010f3fecae45d)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/libxcb.inc | 1 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-lib/libxcb.inc b/meta/recipes-graphics/xorg-lib/libxcb.inc index e40ae77ab4..b02efd278a 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb.inc +++ b/meta/recipes-graphics/xorg-lib/libxcb.inc | |||
| @@ -26,6 +26,7 @@ inherit autotools pkgconfig pythonnative distro_features_check | |||
| 26 | 26 | ||
| 27 | # The libxau and others requires x11 in DISTRO_FEATURES | 27 | # The libxau and others requires x11 in DISTRO_FEATURES |
| 28 | REQUIRED_DISTRO_FEATURES = "x11" | 28 | REQUIRED_DISTRO_FEATURES = "x11" |
| 29 | REQUIRED_DISTRO_FEATURES_class-native = "" | ||
| 29 | 30 | ||
| 30 | python populate_packages_prepend () { | 31 | python populate_packages_prepend () { |
| 31 | do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) | 32 | do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) |
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 09df0109cb..6f4e44454f 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | |||
| @@ -24,3 +24,4 @@ UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0ret | |||
| 24 | " | 24 | " |
| 25 | 25 | ||
| 26 | REQUIRED_DISTRO_FEATURES ?= "x11" | 26 | REQUIRED_DISTRO_FEATURES ?= "x11" |
| 27 | REQUIRED_DISTRO_FEATURES_class-native = "" | ||