[oe-commits] Ross Burton : xorg-lib-common: fix malloc0returnsnull usage
git at git.openembedded.org
git at git.openembedded.org
Mon Oct 14 15:45:39 UTC 2013
Module: openembedded-core.git
Branch: master
Commit: e628c8aba0189de30de2833882b9999ff3b6547a
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=e628c8aba0189de30de2833882b9999ff3b6547a
Author: Ross Burton <ross.burton at intel.com>
Date: Tue Oct 8 11:23:32 2013 +0000
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)
Signed-off-by: Ross Burton <ross.burton at intel.com>
Signed-off-by: Saul Wold <sgw at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
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 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" ]
More information about the Openembedded-commits
mailing list