diff options
Diffstat (limited to 'main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch')
| -rw-r--r-- | main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch | 53 |
1 files changed, 53 insertions, 0 deletions
diff --git a/main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch b/main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch new file mode 100644 index 0000000000..6f02897be3 --- /dev/null +++ b/main/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch @@ -0,0 +1,53 @@ +Submitted By: Ken Moffat <ken at linuxfromscratch dot org> +Date: 2015-04-18 +Initial Package Version: 1.17.1 +Upstream Status: Applied +Origin: Egbert Eich +Description: fixes compilation with gcc-5 + +From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 +From: Egbert Eich <eich@freedesktop.org> +Date: Tue, 3 Mar 2015 16:27:05 +0100 +Subject: symbols: Fix sdksyms.sh to cope with gcc5 + +Gcc5 adds additional lines stating line numbers before and +after __attribute__() which need to be skipped. + +Signed-off-by: Egbert Eich <eich@freedesktop.org> +Tested-by: Daniel Stone <daniels@collabora.com> +Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> + +diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh +index 2305073..05ac410 100755 +--- a/hw/xfree86/sdksyms.sh ++++ b/hw/xfree86/sdksyms.sh +@@ -350,13 +350,25 @@ BEGIN { + if (sdk) { + n = 3; + ++ # skip line numbers GCC 5 adds before __attribute__ ++ while ($n == "" || $0 ~ /^# [0-9]+ "/) { ++ getline; ++ n = 1; ++ } ++ + # skip attribute, if any + while ($n ~ /^(__attribute__|__global)/ || + # skip modifiers, if any + $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ || + # skip pointer +- $n ~ /^[a-zA-Z0-9_]*\*$/) ++ $n ~ /^[a-zA-Z0-9_]*\*$/) { + n++; ++ # skip line numbers GCC 5 adds after __attribute__ ++ while ($n == "" || $0 ~ /^# [0-9]+ "/) { ++ getline; ++ n = 1; ++ } ++ } + + # type specifier may not be set, as in + # extern _X_EXPORT unsigned name(...) +-- +cgit v0.10.2 + |