From ce15d9a1e501b7dc71130119f932116e74a2e391 Mon Sep 17 00:00:00 2001 From: Ross Burton Date: Tue, 8 Oct 2013 11:23:32 +0000 Subject: [PATCH] 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 Signed-off-by: Saul Wold Signed-off-by: Richard Purdie Signed-off-by: Robert Yang Signed-off-by: Richard Purdie --- meta/recipes-graphics/xorg-lib/xorg-lib-common.inc | 5 +++-- 1 file 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}" inherit autotools pkgconfig -EXTRA_OECONF = "--enable-malloc0returnsnull \ - --disable-specs --with-groff=no --with-ps2pdf=no --with-fop=no --without-xmlto" +EXTRA_OECONF = "--disable-specs --without-groff --without-ps2pdf --without-fop --without-xmlto" +EXTRA_OECONF_append_libc-glibc = " --disable-malloc0returnsnull" +EXTRA_OECONF_append_libc-uclibc = " --enable-malloc0returnsnull" python () { whitelist = [ "pixman", "libpciaccess" ]