diff options
author | Florian Franzmann | 2015-04-26 11:33:34 +0200 |
---|---|---|
committer | Florian Franzmann | 2015-04-26 11:33:34 +0200 |
commit | 4ab8eb151a4f9daa5f7fa0484824bcd5e7f421bb (patch) | |
tree | 0921cc79c7943d0a4f42c52b3811fe264897d474 /xorg-xserver | |
parent | e37ceb8db7cb8fd23cd146397006e7c2869a6eda (diff) |
xorg-xserver/xorg-server: fix build with gcc 5
Diffstat (limited to 'xorg-xserver')
-rw-r--r-- | xorg-xserver/xorg-server/HISTORY | 4 | ||||
-rwxr-xr-x | xorg-xserver/xorg-server/PRE_BUILD | 3 | ||||
-rw-r--r-- | xorg-xserver/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch | 53 |
3 files changed, 59 insertions, 1 deletions
diff --git a/xorg-xserver/xorg-server/HISTORY b/xorg-xserver/xorg-server/HISTORY index 3010edc535..d7a7fcd8bd 100644 --- a/xorg-xserver/xorg-server/HISTORY +++ b/xorg-xserver/xorg-server/HISTORY @@ -1,3 +1,7 @@ +2015-04-26 Florian Franzmann <siflfran@hawo.stw.uni-erlangen.de> + * PRE_BUILD, xorg-server-1.17.1-gcc5_fixes-1.patch: add patch from + LFS to fix build with gcc 5 + 2015-04-25 Vlad Glagolev <stealth@sourcemage.org> * CONFIGURE: added selection of SHA1 implementation * DEPENDS: fixed dependencies on a crypto library diff --git a/xorg-xserver/xorg-server/PRE_BUILD b/xorg-xserver/xorg-server/PRE_BUILD index 710034f1f2..bec27b3c54 100755 --- a/xorg-xserver/xorg-server/PRE_BUILD +++ b/xorg-xserver/xorg-server/PRE_BUILD @@ -2,4 +2,5 @@ default_pre_build && # required to build glselect mesa && cd "$SOURCE_DIRECTORY" && -patch -p1 < $SPELL_DIRECTORY/gl_select.patch +patch -p1 < $SPELL_DIRECTORY/gl_select.patch && +patch -p1 < $SPELL_DIRECTORY/xorg-server-1.17.1-gcc5_fixes-1.patch diff --git a/xorg-xserver/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch b/xorg-xserver/xorg-server/xorg-server-1.17.1-gcc5_fixes-1.patch new file mode 100644 index 0000000000..6f02897be3 --- /dev/null +++ b/xorg-xserver/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 + |