commit 4f039cf710f2cada0feb3ad1eac8d1561fc09ac9
Author: Jakub Bogusz <[email protected]>
Date: Sun May 31 08:14:23 2020 +0200
- 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)
fio-config.patch | 10 ++++++++++
fio-no-common.patch | 21 +++++++++++++++++++++
fio.spec | 4 ++++
3 files changed, 35 insertions(+)
---
diff --git a/fio.spec b/fio.spec
index 175a4ab..3f6b7db 100644
--- 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}
diff --git a/fio-config.patch b/fio-config.patch
new file mode 100644
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
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;
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/fio.git/commitdiff/4f039cf710f2cada0feb3ad1eac8d1561fc09ac9
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
