--- trunk/xorg-server/patches/xorg-server-1.17.1-make-sdksyms-work-with-gcc5.patch 2015/06/15 12:22:48 2575 +++ trunk/xorg-server/patches/xorg-server-1.17.1-make-sdksyms-work-with-gcc5.patch 2015/06/15 13:02:17 2576 @@ -1,168 +1,51 @@ - - - -svntogit/packages.git - Git clone of the 'packages' repository - - - - - - - - - - - - -
- -
- -
-
-
- - - -
-summaryrefslogtreecommitdiffstats
- - - -
-
-
path: root/trunk/0001-sdksyms.sh-Make-sdksyms.sh-work-with-gcc5.patch
blob: 0e0b20df6fc96bf2c15043d9093e36d5b5ca6071 (plain) - - -
1
-2
-3
-4
-5
-6
-7
-8
-9
-10
-11
-12
-13
-14
-15
-16
-17
-18
-19
-20
-21
-22
-23
-24
-25
-26
-27
-28
-29
-30
-31
-32
-33
-34
-35
-36
-37
-38
-39
-40
-41
-42
-43
-44
-45
-46
-47
-48
-49
-50
-51
-
From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001
-From: Hans de Goede <hdegoede@redhat.com>
+From 612eb45a2e7a0b35cc3790870e6d0cc42eb50c74 Mon Sep 17 00:00:00 2001
+From: Hans de Goede 
 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")))
+      __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>
----
+Signed-off-by: Hans de Goede 
+---
  hw/xfree86/sdksyms.sh | 17 +++++++++++++++++
  1 file changed, 17 insertions(+)
 
 diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
 index 2305073..99b0cae 100755
---- a/hw/xfree86/sdksyms.sh
-+++ b/hw/xfree86/sdksyms.sh
-@@ -350,6 +350,23 @@ BEGIN {
+--- a/hw/xfree86/sdksyms.sh
++++ b/hw/xfree86/sdksyms.sh
+@@ -350,6 +350,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++;
-+	}
-+
++	# 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
--- 
+-- 
 2.1.0
 
-
-
-
-

Copyright © 2002-2014 Judd Vinet and Aaron Griffin. The Arch Linux name and logo -are recognized trademarks. Some rights reserved. The registered trademark -Linux® is used pursuant to a sublicense from LMI, the exclusive licensee -of Linus Torvalds, owner of the mark on a world-wide basis.

-
-
- -