summaryrefslogtreecommitdiffstats
path: root/meta/recipes-graphics/xorg-lib
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2013-10-08 11:23:32 +0000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-10-14 16:55:25 +0100
commit043b5c6e95a0971cb5f08835c2b6cef9ff6f4624 (patch)
tree7e9ee003a2a6d0662f2ab1563fdd243ee6aa7ee1 /meta/recipes-graphics/xorg-lib
parentea4eafcba3d5c65358dfdc0d6e67953de77d9ebb (diff)
downloadpoky-043b5c6e95a0971cb5f08835c2b6cef9ff6f4624.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 rev: e628c8aba0189de30de2833882b9999ff3b6547a) 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>
Diffstat (limited to 'meta/recipes-graphics/xorg-lib')
-rw-r--r--meta/recipes-graphics/xorg-lib/xorg-lib-common.inc5
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
14inherit autotools pkgconfig 14inherit autotools pkgconfig
15 15
16EXTRA_OECONF = "--enable-malloc0returnsnull \ 16EXTRA_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" 17EXTRA_OECONF_append_libc-glibc = " --disable-malloc0returnsnull"
18EXTRA_OECONF_append_libc-uclibc = " --enable-malloc0returnsnull"
18 19
19python () { 20python () {
20 whitelist = [ "pixman", "libpciaccess" ] 21 whitelist = [ "pixman", "libpciaccess" ]