From 4ce6b864bc7be6c230579f10f8efc77315bb0c72 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Oct 22 2019 14:47:27 +0000 Subject: Add patch to fix build with GCC10 --- diff --git a/apitrace.spec b/apitrace.spec index d8f1514..8d8e248 100644 --- a/apitrace.spec +++ b/apitrace.spec @@ -6,7 +6,7 @@ Name: apitrace Version: 9.0 -Release: 0.3.git%{shortcommit}%{?dist} +Release: 0.4.git%{shortcommit}%{?dist} Summary: Tools for tracing OpenGL License: MIT @@ -17,6 +17,7 @@ Source2: qapitrace.appdata.xml # Unbundle brotli, gtest Patch0: apitrace_unbundle.patch +# Fix build with GCC10 BuildRequires: brotli-devel BuildRequires: cmake @@ -119,6 +120,9 @@ make check %changelog +* Tue Oct 22 2019 Sandro Mani - 9.0-0.4.git0f541f4 +- Add patch to fix build with GCC10 + * Tue Aug 06 2019 Sandro Mani - 9.0-0.3.git0f541f4 - Drop BR: python2 diff --git a/apitrace_gcc10.patch b/apitrace_gcc10.patch new file mode 100644 index 0000000..e41b3c9 --- /dev/null +++ b/apitrace_gcc10.patch @@ -0,0 +1,29 @@ +diff -Nrup a/thirdparty/libbacktrace/btest.c b/thirdparty/libbacktrace/btest.c +--- a/thirdparty/libbacktrace/btest.c 2019-07-03 06:46:05.000000000 -0600 ++++ b/thirdparty/libbacktrace/btest.c 2019-10-17 15:49:18.326666643 -0600 +@@ -277,9 +277,9 @@ error_callback_three (void *vdata, const + + /* Test the backtrace function with non-inlined functions. */ + +-static int test1 (void) __attribute__ ((noinline, unused)); +-static int f2 (int) __attribute__ ((noinline)); +-static int f3 (int, int) __attribute__ ((noinline)); ++static int test1 (void) __attribute__ ((noinline, noclone, unused)); ++static int f2 (int) __attribute__ ((noinline, noclone)); ++static int f3 (int, int) __attribute__ ((noinline, noclone)); + + static int + test1 (void) +@@ -391,9 +391,9 @@ f13 (int f1line, int f2line) + + /* Test the backtrace_simple function with non-inlined functions. */ + +-static int test3 (void) __attribute__ ((noinline, unused)); +-static int f22 (int) __attribute__ ((noinline)); +-static int f23 (int, int) __attribute__ ((noinline)); ++static int test3 (void) __attribute__ ((noinline, noclone, unused)); ++static int f22 (int) __attribute__ ((noinline, noclone)); ++static int f23 (int, int) __attribute__ ((noinline, noclone)); + + static int + test3 (void)