summaryrefslogtreecommitdiffstats
path: root/meta
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:33:23 +0100
commit7b766abeb61ee7660ab813bb0f1befc9072e27b4 (patch)
treebb377cb22f9bf568b0e10ccfe2ae4d631b387576 /meta
parent0b708c5c5799acccc0fdab6c26c2ed6d900b0feb (diff)
downloadpoky-7b766abeb61ee7660ab813bb0f1befc9072e27b4.tar.gz
xserver-xorg: Use __GLIBC__ instread of __linux__ to denote glibc dependent code
Change-Id: Ia899520181feb1c601a76e04a176f4387a331c00 (From OE-Core rev: e9ddb1ba61e1b773e7a0293c0e10f2b329d8bbe1) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-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 0000000000..21e4ed4d20
--- /dev/null
+++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch
@@ -0,0 +1,31 @@
1From f242740f6488a25e6ca84968b0e2319a9a3975b4 Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Mon, 6 Apr 2015 20:52:50 -0700
4Subject: [PATCH] use __GLIBC__ guard for glibc specific code
5
6Using __linux__ is a tad bit wrong assumption since
7linux != glibc
8
9Upstream-Status: Pending
10
11Signed-off-by: Khem Raj <raj.khem@gmail.com>
12---
13 hw/xfree86/os-support/xf86_OSlib.h | 2 +-
14 1 file changed, 1 insertion(+), 1 deletion(-)
15
16diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h
17index eb0a338..c366ffc 100644
18--- a/hw/xfree86/os-support/xf86_OSlib.h
19+++ b/hw/xfree86/os-support/xf86_OSlib.h
20@@ -178,7 +178,7 @@
21 #include <sys/types.h>
22 #include <assert.h>
23
24-#ifdef __linux__
25+#ifdef __GLIBC__
26 #include <termio.h>
27 #else /* __GLIBC__ */
28 #include <termios.h>
29--
302.1.4
31
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 cfbc491fcc..7eeadd145d 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 \
8 file://xtrans.patch \ 8 file://xtrans.patch \
9 file://0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch \ 9 file://0001-xkb-Don-t-swap-XkbSetGeometry-data-in-the-input-buff.patch \
10 file://0001-xkb-Check-strings-length-against-request-size.patch \ 10 file://0001-xkb-Check-strings-length-against-request-size.patch \
11 file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \
11 " 12 "
12 13
13SRC_URI[md5sum] = "afd93977235584a9caa7528a737c1b52" 14SRC_URI[md5sum] = "afd93977235584a9caa7528a737c1b52"