diff options
author | Ross Burton <ross.burton@intel.com> | 2013-10-08 11:23:32 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-12-12 16:59:53 +0000 |
commit | ce15d9a1e501b7dc71130119f932116e74a2e391 (patch) | |
tree | c98dd75b65df3849b510f3085f94664d8f59604d /meta/recipes-graphics | |
parent | 2ec209c0f45f8fb3f455e3316b36d4a59d043143 (diff) | |
download | poky-ce15d9a1e501b7dc71130119f932116e74a2e391.tar.gz |
xorg-lib-common: fix malloc0returnsnull usage
Xorg libraries that use Xmalloc need to know if malloc(0) returns NULL or not,
and as this is a runtime test it can't be checked for. Previously
xorg-lib-common declared that malloc(0) did return NULL, but this isn't true for
eglibc (only uclibc).
Instead, use libc-specific overrides to pass the relevant option.
(ideally the check would use the autoconf cache so this can be stored in the site files)
(From OE-Core master rev: e628c8aba0189de30de2833882b9999ff3b6547a)
(From OE-Core rev: 93e084ae8bcae8e7bde5a7e52a274a39dc9ba509)
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Saul Wold <sgw@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Signed-off-by: Robert Yang <liezhi.yang@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
-rw-r--r-- | meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index c911925505..98e1416285 100644 --- a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | |||
@@ -13,8 +13,9 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" | |||
13 | 13 | ||
14 | inherit autotools pkgconfig | 14 | inherit autotools pkgconfig |
15 | 15 | ||
16 | EXTRA_OECONF = "--enable-malloc0returnsnull \ | 16 | EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" |
17 | --disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no --without-xmlto" | 17 | EXTRA_OECONF_append_libc-glibc = " --disable-malloc0returnsnull" |
18 | EXTRA_OECONF_append_libc-uclibc = " --enable-malloc0returnsnull" | ||
18 | 19 | ||
19 | python () { | 20 | python () { |
20 | whitelist = [ "pixman", "libpciaccess" ] | 21 | whitelist = [ "pixman", "libpciaccess" ] |