- added no-common patch (fix build with -fno-common, gcc 10 default)

- added config patch (include config-host.h in fio.h, some headers rely on its defines)

diff --git a/fio-config.patch b/fio-config.patch
new file mode 100644 (file)
index 0000000..1c22eea
--- /dev/null
+++ b/fio-config.patch
@@ -0,0 +1,10 @@
+--- fio-3.20/fio.h.orig        2020-05-23 19:14:14.000000000 +0200
++++ fio-3.20/fio.h     2020-05-31 07:41:20.001840008 +0200
+@@ -14,6 +14,7 @@
+ #include <inttypes.h>
+ #include <assert.h>
+ 
++#include "config-host.h"
+ #include "compiler/compiler.h"
+ #include "thread_options.h"
+ #include "flist.h"

diff --git a/fio-no-common.patch b/fio-no-common.patch
new file mode 100644 (file)
index 0000000..c122570
--- /dev/null
+++ b/fio-no-common.patch
@@ -0,0 +1,21 @@
+--- fio-3.20/gfio.h.orig       2020-05-23 19:14:14.000000000 +0200
++++ fio-3.20/gfio.h    2020-05-31 07:38:31.099999894 +0200
+@@ -53,7 +53,7 @@
+ /*
+  * Main window widgets and data
+  */
+-struct gui {
++extern struct gui {
+       GtkUIManager *uimanager;
+       GtkRecentManager *recentmanager;
+       GtkActionGroup *actiongroup;
+--- fio-3.20/gfio.c.orig       2020-05-23 19:14:14.000000000 +0200
++++ fio-3.20/gfio.c    2020-05-31 07:40:17.605364061 +0200
+@@ -38,6 +38,7 @@
+ #include "gclient.h"
+ #include "graph.h"
+ 
++struct gui main_ui;
+ static bool gfio_server_running;
+ static unsigned int gfio_graph_limit = 100;
+ 

diff --git a/fio.spec b/fio.spec
index 175a4ab614dfd5196360018f268b646e63a41c98..3f6b7dbc1402f2ee99094bb288db9aa561900d12 100644 (file)
--- a/fio.spec
+++ b/fio.spec
@@ -23,6 +23,8 @@ Group:                Applications/System
 Source0:       http://brick.kernel.dk/snaps/%{name}-%{version}.tar.bz2
 # Source0-md5: 5cf2eabf487c51001aceada90f961555
 Patch0:                %{name}-guasi.patch
+Patch1:                %{name}-no-common.patch
+Patch2:                %{name}-config.patch
 URL:           http://git.kernel.dk/?p=fio.git;a=summary
 BuildRequires: bison
 %{?with_ceph:BuildRequires:    ceph-devel}
@@ -102,6 +104,8 @@ na serwerze.
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
+%patch2 -p1
 
 %{__sed} -i -e '1s,/usr/bin/bash,/bin/bash,' tools/genfio
 %{__sed} -i -e '1s,/usr/bin/env python$,%{__python},' tools/{hist/fio-histo-log-pctiles.py,plot/fio2gnuplot}