diff options
| author | Khem Raj <raj.khem@gmail.com> | 2014-08-28 18:43:54 -0700 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-09-01 18:00:31 +0100 |
| commit | 60f78480135aab55e538c9e4e0b6d387139f1404 (patch) | |
| tree | 300a4e087282b99ff5b66d730c76209dd92f571c /meta/recipes-graphics/xorg-driver/xf86-input-vmmouse | |
| parent | 32b3a9ca554d9ff8f3b9c2ff62cc66ee865c61bf (diff) | |
| download | openembedded-core-60f78480135aab55e538c9e4e0b6d387139f1404.tar.gz openembedded-core-60f78480135aab55e538c9e4e0b6d387139f1404.tar.bz2 openembedded-core-60f78480135aab55e538c9e4e0b6d387139f1404.zip | |
xf86-input-synaptics/xf86-input-vmmouse: Fix build with glibc 2.20
Backport the upstream patches needed for them to work with glibc 2.20
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta/recipes-graphics/xorg-driver/xf86-input-vmmouse')
| -rw-r--r-- | meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch | 81 |
1 files changed, 81 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch new file mode 100644 index 0000000000..12fb9df2fd --- /dev/null +++ b/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse/always_include_config.h.patch @@ -0,0 +1,81 @@ +From 336f8633837abe4a1e5ba84b53ac8b9dac5d29a2 Mon Sep 17 00:00:00 2001 +From: Jeremy Huddleston Sequoia <jeremyhu@apple.com> +Date: Thu, 28 Nov 2013 11:59:53 -0800 +Subject: Always include config.h first + +This fixes some build warnings about CSRG_BASED being redefined due to +incorrect header include ordering. + +Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu@apple.com> + +Upstream-Status: Backport + +Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c +=================================================================== +--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_client.c 2014-08-28 18:33:16.168070587 -0700 ++++ xf86-input-vmmouse-13.0.0/shared/vmmouse_client.c 2014-08-28 18:33:16.152070587 -0700 +@@ -39,6 +39,10 @@ + #endif + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "vmmouse_client.h" + #include "vmmouse_proto.h" + +Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c +=================================================================== +--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.c 2014-08-28 18:33:16.168070587 -0700 ++++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.c 2014-08-28 18:33:16.156070587 -0700 +@@ -33,6 +33,10 @@ + */ + + ++#ifdef HAVE_CONFIG_H ++#include "config.h" ++#endif ++ + #include "vmmouse_proto.h" + + +Index: xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h +=================================================================== +--- xf86-input-vmmouse-13.0.0.orig/shared/vmmouse_proto.h 2014-08-28 18:33:16.168070587 -0700 ++++ xf86-input-vmmouse-13.0.0/shared/vmmouse_proto.h 2014-08-28 18:33:16.156070587 -0700 +@@ -36,11 +36,6 @@ + #ifndef _VMMOUSE_PROTO_H_ + #define _VMMOUSE_PROTO_H_ + +- +-#ifdef HAVE_CONFIG_H +-#include "config.h" +-#endif +- + #include <stdint.h> + + #ifdef HAVE_XORG_SERVER_1_1_0 +Index: xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c +=================================================================== +--- xf86-input-vmmouse-13.0.0.orig/tools/vmmouse_detect.c 2014-08-28 18:33:16.168070587 -0700 ++++ xf86-input-vmmouse-13.0.0/tools/vmmouse_detect.c 2014-08-28 18:33:16.160070587 -0700 +@@ -26,14 +26,14 @@ + */ + + +-#include <stdlib.h> +-#include <signal.h> +-#include "vmmouse_client.h" +- + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif + ++#include <stdlib.h> ++#include <signal.h> ++#include "vmmouse_client.h" ++ + void + segvCB(int sig) + { |