From 772f6addbe792eb0cf093c81b447219912d33c06 Mon Sep 17 00:00:00 2001 From: Xavier Bachelot Date: Thu, 13 Jul 2017 14:18:53 +0200 Subject: [PATCH] Add patch from Honza Horak to fix build against mariadb 10.2 (RHBZ#1470540) --- sysbench-1.0.8-fix_build_with_mariadb_10_2.patch | 10 ++++++++++ sysbench.spec | 11 ++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 sysbench-1.0.8-fix_build_with_mariadb_10_2.patch diff --git a/sysbench-1.0.8-fix_build_with_mariadb_10_2.patch b/sysbench-1.0.8-fix_build_with_mariadb_10_2.patch new file mode 100644 index 0000000..1dc1876 --- /dev/null +++ b/sysbench-1.0.8-fix_build_with_mariadb_10_2.patch @@ -0,0 +1,10 @@ +--- sysbench-1.0.8-orig/src/drivers/mysql/drv_mysql.c 2017-07-13 09:07:07.132681600 +0200 ++++ sysbench-1.0.8-orig/src/drivers/mysql/drv_mysql.c 2017-07-13 09:07:39.024776526 +0200 +@@ -35,6 +35,7 @@ + #include + + #include ++#include + #include + #include + diff --git a/sysbench.spec b/sysbench.spec index f6a0320..ce0f744 100644 --- a/sysbench.spec +++ b/sysbench.spec @@ -1,12 +1,16 @@ Summary: System performance benchmark Name: sysbench Version: 1.0.8 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2+ Group: Applications/System Source0: https://github.com/akopytov/%{name}/archive/%{version}/%{name}-%{version}.tar.gz URL: https://github.com/akopytov/sysbench/ +# https://bugzilla.redhat.com/show_bug.cgi?id=1470540 +# https://github.com/akopytov/sysbench/issues/160 +Patch0: sysbench-1.0.8-fix_build_with_mariadb_10_2.patch + BuildRequires: automake BuildRequires: ck-devel BuildRequires: docbook-style-xsl @@ -60,6 +64,8 @@ rm -r third_party/luajit/luajit/ rm -r third_party/concurrency_kit/ck/ %{!?el6:rm -r third_party/cram/} +%patch0 -p1 -b .mariadb_10_2 + %build export CFLAGS="%{optflags}" autoreconf -vif @@ -93,6 +99,9 @@ cd tests %changelog +* Thu Jul 13 2017 Xavier Bachelot 1.0.8-2 +- Add patch from Honza Horak to fix build against mariadb 10.2 (RHBZ#1470540). + * Wed Jul 05 2017 Xavier Bachelot 1.0.8-1 - Update to 1.0.8. - Fix creation and installation of manual.html file.