Skip to contentSkip to conversation

package/x11r7/xserver_xorg-server: fix gcc5+ build with version 1.14.7

PATCH New Bernd Kuhls 3 participants 3 messages Jun 5, 2017 – Jun 6, 2017

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix gcc5+ build with version 1.14.7

Fixes

sdksyms.c:311:15: error: expected expression before ?,? token
(void *) &, /* ../../include/os.h:96 */

by backporting an upstream patch, sdksyms.c is generated by hw/xfree86/sdksyms.sh which is broken when used with gcc5+.

Problem was found while testing
http://patchwork.ozlabs.org/patch/762102/

using this defconfig

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14=y
BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB=y

---
 .../1.14.7/0001-sdksyms-gcc5.patch                 | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch
package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch new file +50 -0
new file mode 100644
index 000000000..ad544aa30
@@ -0,0 +1,50 @@
+From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001
+From: Egbert Eich <[email protected]>
+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.
+
+Downloaded from upstream commit
+https://cgit.freedesktop.org/xorg/xserver/commit/hw/xfree86/sdksyms.sh?id=21b896939c5bb242f3aacc37baf12379e43254b6
+
+Signed-off-by: Bernd Kuhls <[email protected]>
+Signed-off-by: Egbert Eich <[email protected]>
+Tested-by: Daniel Stone <[email protected]>
+Signed-off-by: Peter Hutterer <[email protected]>
+
+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
+
Signature · 1 line
2.11.0
#1 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix gcc5+ build with version 1.14.7

Hello,

Quoted 20 lines · Bernd Kuhls

Fixes

sdksyms.c:311:15: error: expected expression before ?,? token
(void *) &, /* ../../include/os.h:96 */

by backporting an upstream patch, sdksyms.c is generated by hw/xfree86/sdksyms.sh which is broken when used with gcc5+.

Problem was found while testing
http://patchwork.ozlabs.org/patch/762102/

using this defconfig

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14=y
BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB=y

Quoted 5 lines
---
 .../1.14.7/0001-sdksyms-gcc5.patch                 | 50 ++++++++++++++++++++++
 1 file changed, 50 insertions(+)
 create mode 100644 package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch

Applied to master, thanks. Peter: this qualifies for the LTS branch I guess.

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com
#2 lore raw

PATCH 1/1 package/x11r7/xserver_xorg-server: fix gcc5+ build with version 1.14.7

Quoted 24 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line

"Thomas" == Thomas Petazzoni <[email protected]> writes:

Hello,

Quoted 20 lines · Bernd Kuhls

Fixes

sdksyms.c:311:15: error: expected expression before ?,? token
(void *) &, /* ../../include/os.h:96 */

by backporting an upstream patch, sdksyms.c is generated by hw/xfree86/sdksyms.sh which is broken when used with gcc5+.

Problem was found while testing
http://patchwork.ozlabs.org/patch/762102/

using this defconfig

BR2_TOOLCHAIN_BUILDROOT_WCHAR=y
BR2_TOOLCHAIN_BUILDROOT_CXX=y
BR2_PACKAGE_XORG7=y
BR2_PACKAGE_XSERVER_XORG_SERVER=y
BR2_PACKAGE_XSERVER_XORG_SERVER_V_1_14=y
BR2_PACKAGE_XDRIVER_XF86_INPUT_TSLIB=y

Quoted 8 lines
Quoted 5 lines

---
.../1.14.7/0001-sdksyms-gcc5.patch | 50 ++++++++++++++++++++++

1 file changed, 50 insertions(+)

create mode 100644 package/x11r7/xserver_xorg-server/1.14.7/0001-sdksyms-gcc5.patch

Applied to master, thanks. Peter: this qualifies for the LTS branch I guess.

Indeed - Committed to 2017.02.x and 2017.05.x, thanks!

Signature · 1 line
Bye, Peter Korsgaard