Patchwork xorg-lib-common: fix malloc0returnsnull usage

login
register
mail settings
Submitter Ross Burton
Date Oct. 8, 2013, 11:23 a.m.
Message ID <1381231412-31162-1-git-send-email-ross.burton@intel.com>
Download mbox | patch
Permalink /patch/59481/
State Accepted
Commit e628c8aba0189de30de2833882b9999ff3b6547a
Headers show

Comments

Ross Burton - Oct. 8, 2013, 11:23 a.m.
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)

Signed-off-by: Ross Burton <ross.burton@intel.com>
---
 meta/recipes-graphics/xorg-lib/xorg-lib-common.inc |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

Patch

diff --git a/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc
index c911925..98e1416 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" ]