diff options
author | Bernd Kuhls <bernd.kuhls@t-online.de> | 2015-06-14 21:05:27 +0200 |
---|---|---|
committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2015-06-14 23:07:36 +0200 |
commit | 409c496e9ac3787cc0472ac722ac0f7bdacc83fa (patch) | |
tree | c95b3b302302b4d12b9d0a9cb38e66bb9a52cf22 /package/x11r7/xserver_xorg-server | |
parent | d6d237c8c2313829b6f7b4f06d55a5a4c89a870b (diff) | |
download | buildroot-409c496e9ac3787cc0472ac722ac0f7bdacc83fa.tar.gz buildroot-409c496e9ac3787cc0472ac722ac0f7bdacc83fa.zip |
package/x11r7/xserver_xorg-server: Fix sdksyms.sh to cope with gcc5
Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package/x11r7/xserver_xorg-server')
-rw-r--r-- | package/x11r7/xserver_xorg-server/1.17.1/0002-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/package/x11r7/xserver_xorg-server/1.17.1/0002-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch b/package/x11r7/xserver_xorg-server/1.17.1/0002-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch new file mode 100644 index 0000000000..01eefe517d --- /dev/null +++ b/package/x11r7/xserver_xorg-server/1.17.1/0002-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch @@ -0,0 +1,52 @@ +backported from upstream +http://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/sdksyms.sh?id=21b896939c5bb242f3aacc37baf12379e43254b6 + +Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> + + +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 + |