diff options
| author |   Ross Burton <ross.burton@intel.com> | 2013-10-08 11:23:32 +0000 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2013-10-14 16:54:27 +0100 |
| commit | e628c8aba0189de30de2833882b9999ff3b6547a (patch) | |
| tree | 86c091438789b1c8a8fd9104a32d5f68d99dadff /meta/recipes-graphics | |
| parent | b57e7fa8b35cfcf9af6ca72d51bdf67e49254ac2 (diff) | |
| download | openembedded-core-contrib-e628c8aba0189de30de2833882b9999ff3b6547a.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)
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')
| -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}" 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" ] |