diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2015-04-23 20:35:21 -0700 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-27 14:59:48 +0100 |
| commit | 44131ab24e7278918274917e9a863b48f5475640 (patch) | |
| tree | bdfed30f88a1f819b29d1c92d290df7186a12123 /meta/recipes-graphics | |
| parent | 2bdbadd053a5e4f951a81f9094b6f8b99c4403d1 (diff) | |
| download | openembedded-core-contrib-44131ab24e7278918274917e9a863b48f5475640.tar.gz | |
xserver-xorg: Fix build with gcc-5
Backport a patch from fedora details are in patch header
Change-Id: I6b8dfaae3b751071bf8b0d88b15a4f95c19877f6
(From OE-Core rev: 100ab2578bd2025aed940fddce467a4606962695)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-graphics')
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch | 50 | ||||
| -rw-r--r-- | meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb | 1 |
2 files changed, 51 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch new file mode 100644 index 0000000000..215c044113 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch @@ -0,0 +1,50 @@ +Upstream-Status: Pending + +From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001 +From: Hans de Goede <hdegoede@redhat.com> +Date: Wed, 11 Feb 2015 16:26:40 +0100 +Subject: [PATCH] sdksyms.sh: Make sdksyms.sh work with gcc5. + +gcc5's cpp inserts patterns like this: + +extern + __attribute__((visibility("default"))) + int WaitForSomething(int * + ); + +This patch make sdksyms.sh work with this. Note my awk skills are weak, so +there likely is a better way to deal with this. + +Signed-off-by: Hans de Goede <hdegoede@redhat.com> +--- + hw/xfree86/sdksyms.sh | 17 +++++++++++++++++ + 1 file changed, 17 insertions(+) + +Index: xorg-server-1.16.3/hw/xfree86/sdksyms.sh +=================================================================== +--- xorg-server-1.16.3.orig/hw/xfree86/sdksyms.sh ++++ xorg-server-1.16.3/hw/xfree86/sdksyms.sh +@@ -353,6 +353,23 @@ BEGIN { + if (sdk) { + n = 3; + ++ # detect the following gcc5 cpp pattern and skip it: ++ # extern ++ # # 320 "../../include/os.h" 3 4 ++ # __attribute__((visibility("default"))) ++ # # 320 "../../include/os.h" ++ # Note in this case the "extern " or "extern void " always has ++ # a trailing space ++ if ($0 ~ "^extern.* $") { ++ getline; ++ getline; ++ getline; ++ getline; ++ n = 1; ++ while ($n == " ") ++ n++; ++ } ++ + # skip attribute, if any + while ($n ~ /^(__attribute__|__global)/ || + # skip modifiers, if any 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 7eeadd145d..780ece0a33 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 @@ -9,6 +9,7 @@ SRC_URI += "file://fix_open_max_preprocessor_error.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 \ + file://0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch \ " SRC_URI[md5sum] = "afd93977235584a9caa7528a737c1b52" |