Fix the tests on arm

This commit is contained in:
Kalev Lember 2018-03-20 16:37:33 +01:00
parent d537b5c095
commit cc3e55fda6
2 changed files with 53 additions and 0 deletions

View File

@ -0,0 +1,50 @@
From 05fd07f4277414ae39a0336ac04c94a58ef2aa96 Mon Sep 17 00:00:00 2001
From: Daniel Stone <daniels@collabora.com>
Date: Tue, 20 Mar 2018 11:01:02 +0000
Subject: [PATCH] wayland-egl: Ignore underscored symbols in ABI check
Rather than a hard-coded list of platform symbols, just ignore anything
prefaced with an underscore. This fixes breakage on ARM, which declares
several slightly different platform symbols to x86.
Signed-off-by: Daniel Stone <daniels@collabora.com>
Fixes: 21b1f22eb056 ("wayland-egl: enhance the symbol test")
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105620
Cc: Emil Velikov <emil.velikov@collabora.com>
Reviewed-by: Derek Foreman <derekf@osg.samsung.com>
---
egl/wayland-egl-symbols-check | 10 +---------
1 file changed, 1 insertion(+), 9 deletions(-)
diff --git a/egl/wayland-egl-symbols-check b/egl/wayland-egl-symbols-check
index 70fe1f4cfdb5..d04fd042f43a 100755
--- a/egl/wayland-egl-symbols-check
+++ b/egl/wayland-egl-symbols-check
@@ -16,14 +16,6 @@ fi
AVAIL_FUNCS="$($NM -D --format=bsd --defined-only $LIB | awk '{print $3}')"
-# Platform specific symbols.
-PLAT_FUNCS="__bss_start
-_edata
-_end
-_fini
-_init
-"
-
# Official ABI, taken from the header.
REQ_FUNCS="wl_egl_window_resize
wl_egl_window_create
@@ -32,8 +24,8 @@ wl_egl_window_get_attached_size
"
NEW_ABI=$(echo "$AVAIL_FUNCS" | while read func; do
+ echo "$func" | grep -q "^_" && continue
echo "$REQ_FUNCS" | grep -q "^$func$" && continue
- echo "$PLAT_FUNCS" | grep -q "^$func$" && continue
echo $func
done)
--
2.16.2

View File

@ -7,6 +7,9 @@ License: MIT
URL: http://wayland.freedesktop.org/
Source0: http://wayland.freedesktop.org/releases/%{name}-%{version}.tar.xz
# Backported from upstream
Patch0: 0001-wayland-egl-Ignore-underscored-symbols-in-ABI-check.patch
BuildRequires: chrpath
BuildRequires: docbook-style-xsl
BuildRequires: doxygen