aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2015-04-10 18:20:42 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-04-13 22:28:36 +0100
commite9ddb1ba61e1b773e7a0293c0e10f2b329d8bbe1 (patch)
treeb06ac0da3fd643043e23c0dec1a84945d9cea435
parentd30fba63286dc8f5ac72ac65fae6af6001e58ec2 (diff)
downloadopenembedded-core-contrib-e9ddb1ba61e1b773e7a0293c0e10f2b329d8bbe1.tar.gz
openembedded-core-contrib-e9ddb1ba61e1b773e7a0293c0e10f2b329d8bbe1.tar.bz2
openembedded-core-contrib-e9ddb1ba61e1b773e7a0293c0e10f2b329d8bbe1.zip
xserver-xorg: Use __GLIBC__ instread of __linux__ to denote glibc dependent code
Change-Id: Ia899520181feb1c601a76e04a176f4387a331c00 Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch31
-rw-r--r--meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb1
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
new file mode 100644
index 00000000000..21e4ed4d205
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
@@ -0,0 +1,31 @@
+From f242740f6488a25e6ca84968b0e2319a9a3975b4 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Mon, 6 Apr 2015 20:52:50 -0700
+Subject: [PATCH] use __GLIBC__ guard for glibc specific code
+
+Using __linux__ is a tad bit wrong assumption since
+linux != glibc
+
+Upstream-Status: Pending
+
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ hw/xfree86/os-support/xf86_OSlib.h | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
+index eb0a338..c366ffc 100644
+--- a/hw/xfree86/os-support/xf86_OSlib.h
++++ b/hw/xfree86/os-support/xf86_OSlib.h
+@@ -178,7 +178,7 @@
+ #include <sys/types.h>
+ #include <assert.h>
+
+-#ifdef __linux__
++#ifdef __GLIBC__
+ #include <termio.h>
+ #else /* __GLIBC__ */
+ #include <termios.h>
+--
+2.1.4
+
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb
index cfbc491fcc5..7eeadd145da 100644
--- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb
@@ -8,6 +8,7 @@ SRC_URI += "file://fix_open_max_preprocessor_error.patch \
file://xtrans.patch \
file://0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch \
file://0001-xkb-Check-strings-length-against-request-size.patch \
+ file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
"
SRC_URI[md5sum] = "afd93977235584a9caa7528a737c1b52"