diff options
| author |   Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-05 19:14:04 +0200 |
|---|---|---|
| committer | Martin Jansa <Martin.Jansa@gmail.com> | 2014-10-06 01:07:53 +0200 |
| commit | 17ff23b4a4a0e5ed7efde107fb00296f1ebd5fdd (patch) | |
| tree | e4115829eec9754edd4aff01c76d8525470aadd1 /meta-oe/recipes-graphics/xorg-driver | |
| parent | d93c0965190ef0e80cd61eeb69309f6879826452 (diff) | |
| download | meta-openembedded-contrib-17ff23b4a4a0e5ed7efde107fb00296f1ebd5fdd.tar.gz | |
xf86-video-geode: fix build with new glibc-2.20
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
Diffstat (limited to 'meta-oe/recipes-graphics/xorg-driver')
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch | 41 | ||||
| -rw-r--r-- | meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb | 1 |
2 files changed, 42 insertions, 0 deletions
diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch new file mode 100644 index 0000000000..fcd2f684b1 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode/0001-Add-config.h-include-to-src-lx_memory.c.patch @@ -0,0 +1,41 @@ +From 621d946e56efac2c779b83b1a5c6b645169c4ebd Mon Sep 17 00:00:00 2001 +From: "Brian A. Lloyd" <brian.lloyd@familyhonor.net> +Date: Wed, 1 Oct 2014 12:35:18 +0300 +Subject: [PATCH] Add config.h include to src/lx_memory.c + +The src/lx_memory.c file uses the xf86.h header file. This file must have +HAVE_STRNDUP defined before calling it when the building platform has a strndup +function. When using config.h, this file doesn't have that define and so fails +to compile. + +The attached patch adds the conditional config.h to this file so it may compile +on the affected platforms. + +The patch is trivial and may be included and used under whatever licensing +desired. + +Closes: Free Desktop Bug #84541 + +Signed-off-by: Brian A. Lloyd <brian.lloyd@familyhonor.net> +Upstream-Status: Backport +--- + src/lx_memory.c | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/lx_memory.c b/src/lx_memory.c +index f26d280..992446f 100644 +--- a/src/lx_memory.c ++++ b/src/lx_memory.c +@@ -22,6 +22,9 @@ + * contributors may be used to endorse or promote products derived from this + * software without specific prior written permission. + */ ++#if HAVE_CONFIG_H ++#include "config.h" ++#endif + + #include "xf86.h" + #include "geode.h" +-- +2.1.1 + diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb index 4e8df46c78..478d08805d 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-geode_2.11.16.bb @@ -4,6 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e7f3e39474aeea5af381a8e103dafc36" SUMMARY = "X.org server -- Geode GX2/LX display driver" PR = "${INC_PR}.0" +SRC_URI += "file://0001-Add-config.h-include-to-src-lx_memory.c.patch" SRC_URI[md5sum] = "35fa387f6a33f6b22a56ce4bda424392" SRC_URI[sha256sum] = "38fc1f55e29fb7985b90c9021a4b7e5295d42888bd669174f42f3b7f681fc1a7" |