diff options
author | Ross Burton <ross.burton@intel.com> | 2015-12-22 22:12:30 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-12-28 09:25:19 +0000 |
commit | d6e7b5b1b18eaea8d0b700e8b9d82e53ef9ce67e (patch) | |
tree | dda9ea4ca1b7bbab19238bc1c8facaf5cb9c0c11 /meta | |
parent | 4cba706801e96433e6baeb6f3467c34d3797b064 (diff) | |
download | poky-d6e7b5b1b18eaea8d0b700e8b9d82e53ef9ce67e.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: 161bb3409edee21827cf594cc011fe88185f1496)
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_1.11.1.bb | 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_1.11.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb index 4372be1a0d..0856c190a4 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb | |||
@@ -29,6 +29,7 @@ inherit autotools pkgconfig distro_features_check | |||
29 | 29 | ||
30 | # The libxau and others requires x11 in DISTRO_FEATURES | 30 | # The libxau and others requires x11 in DISTRO_FEATURES |
31 | REQUIRED_DISTRO_FEATURES = "x11" | 31 | REQUIRED_DISTRO_FEATURES = "x11" |
32 | REQUIRED_DISTRO_FEATURES_class-native = "" | ||
32 | 33 | ||
33 | python populate_packages_prepend () { | 34 | python populate_packages_prepend () { |
34 | do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) | 35 | 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 = "" | ||