[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/sysbench/files/, app-benchmarks/sysbench/

[gentoo-commits] repo/gentoo:master commit in: app-benchmarks/sysbench/files/, app-benchmarks/sysbench/

[Amy Liffey]

commit:     ebec6d4ec0a5cff7029f0b6af6dcdbc6bbb250b2
Author:     Tomáš Mózes <hydrapolic <AT> gmail <DOT> com>
AuthorDate: Fri Oct  6 07:41:19 2017 +0000
Commit:     Amy Liffey <amynka <AT> gentoo <DOT> org>
CommitDate: Sun Oct  8 07:42:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ebec6d4e

app-benchmarks/sysbench: bump to 1.0.9

Closes:#5870

 app-benchmarks/sysbench/Manifest                   |  1 +
 .../files/sysbench-fix-mariadb-include.patch       | 21 +++++++
 app-benchmarks/sysbench/sysbench-1.0.9.ebuild      | 66 ++++++++++++++++++++++
 3 files changed, 88 insertions(+)

diff --git a/app-benchmarks/sysbench/Manifest b/app-benchmarks/sysbench/Manifest
index b3aa864a9ce..8fd79c62908 100644
--- a/app-benchmarks/sysbench/Manifest
+++ b/app-benchmarks/sysbench/Manifest
@@ -1,3 +1,4 @@
 DIST sysbench-1.0.6.tar.gz 1493941 SHA256 cd23c622da3d3267885ed126540dc04c578ee16c3d31307e21b5acd8e4036eda SHA512 d17a8a8b2387458b467b3e5034b37cb075ffc444c5576013fe7ac3d390c110e0fb4bc6a39f9b350f7ce9b40f3f039e0af9eb84ffafe9ab05a8be5b36ac5b56ac WHIRLPOOL 8d1073a720fd8220769a509677e3d638d93d6aca247a5d2c9017eae3e05391a63e28fade0d306e56a82c5835db58926178e66f1ef94859e2f65497cbe89a172e
 DIST sysbench-1.0.7.tar.gz 1494571 SHA256 db91521e70b0d1a6fccc60a8d4acadacb3f9328e8ab6802ae82f93393a688d43 SHA512 0b32ad27180ab02df9c2e5e85a8b9bec231338cfb20d7337dd80f1e0628b48bae480fde9d69cd21730aa0ab7c65fecbede9c10cd4b96d0dcf44cd012afa10d65 WHIRLPOOL f33c7d328ce1bec01321656b65123a6b790647f36db7351f6cae5340ee8678c66dc3a4d05a36babe8bec51b42ee0fff937b9c28fa2697408fca5842af50072e1
 DIST sysbench-1.0.8.tar.gz 1494988 SHA256 2dad131a99578999c8159eccd2f7ec1b9da4eca9e646dfeb838cf72c00862d69 SHA512 1baba00dc116a97295e4be26488598d160b7688739b08551d0cf2089bcd0f89a0c8edba6faa3634ea98955aecc04966e8328e79978352647ed764dcbe170566f WHIRLPOOL e1b13661adbe00b86bc5533962974c6eb3869e71392e7815a50543fbd50bae3f843a932c02f8a17decd5ac4fac644f52b564b1c1073292e6778dafe1d7b9eeac
+DIST sysbench-1.0.9.tar.gz 1495628 SHA256 3e472d5b175dcc5a8b0ebdf102dbe64bdcc712f6c41812849490e739bf8ce483 SHA512 498b267585e8186f9db4a0f6c6147d1051dab049dae71ddee27f2fedc50ce5ccd75a9ea91819f1fcd15a4d680c4111f5014c60e5a0a69b0a6f217b1a04e61538 WHIRLPOOL 8163bf6f6e5ce85067746036f5cd5f08f2b2d2634f99b5a4e62656ad5091a5f01117672163fc23482fa00e67b1d96d60af7996994965f580b11ccff96e69dc24

diff --git a/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch b/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch
new file mode 100644
index 00000000000..7c3ac31dc9d
--- /dev/null
+++ b/app-benchmarks/sysbench/files/sysbench-fix-mariadb-include.patch
@@ -0,0 +1,21 @@
+--- a/src/drivers/mysql/drv_mysql.c.orig	2017-10-06 06:24:37.930414458 +0000
++++ b/src/drivers/mysql/drv_mysql.c	2017-10-06 06:25:19.647414458 +0000
+@@ -35,7 +35,6 @@
+ #include <stdio.h>
+ 
+ #include <mysql.h>
+-#include <mysql_version.h>
+ #include <mysqld_error.h>
+ #include <errmsg.h>
+ 
+@@ -50,8 +49,8 @@
+ 
+ #define SAFESTR(s) ((s != NULL) ? (s) : "(null)")
+ 
+-#if !defined(MARIADB_BASE_VERSION) && MYSQL_VERSION_ID >= 80001 && \
+-  MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */
++#if !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID) && \
++  MYSQL_VERSION_ID >= 80001 && MYSQL_VERSION_ID != 80002 /* see https://bugs.mysql.com/?id=87337 */
+ typedef bool my_bool;
+ #endif
+ 

diff --git a/app-benchmarks/sysbench/sysbench-1.0.9.ebuild b/app-benchmarks/sysbench/sysbench-1.0.9.ebuild
new file mode 100644
index 00000000000..4a7face7bc1
--- /dev/null
+++ b/app-benchmarks/sysbench/sysbench-1.0.9.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit pax-utils
+
+DESCRIPTION="System performance benchmark"
+HOMEPAGE="https://github.com/akopytov/sysbench"
+SRC_URI="https://github.com/akopytov/sysbench/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aio mysql postgres test"
+
+RDEPEND="aio? ( dev-libs/libaio )
+	mysql? ( virtual/libmysqlclient )
+	postgres? ( dev-db/postgresql:= )"
+DEPEND="${RDEPEND}
+	app-editors/vim-core
+	dev-lang/luajit:=
+	dev-libs/concurrencykit
+	dev-libs/libxslt
+	sys-devel/libtool:=
+	virtual/pkgconfig
+	test? ( dev-util/cram )"
+
+# https://github.com/akopytov/sysbench/commit/f5fa7800cbbdd3920290e04e597d90a26cde7608
+PATCHES=( "${FILESDIR}/${PN}-fix-mariadb-include.patch" )
+
+src_prepare() {
+	default
+
+	sed -i -e "/^htmldir =/s:=.*:=/usr/share/doc/${PF}/html:" doc/Makefile.am || die
+
+	# remove bundled libs
+	rm -r third_party/luajit/luajit third_party/concurrency_kit/ck third_party/cram || die
+
+	./autogen.sh || die
+}
+
+src_configure() {
+	local myeconfargs=(
+		$(use_enable aio aio)
+		$(use_with mysql mysql)
+		$(use_with postgres pgsql)
+		--without-attachsql
+		--without-drizzle
+		--without-oracle
+		--with-system-luajit
+		--with-system-ck
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	pax-mark m "${S}/src/${PN}"
+}
+
+src_test() {
+	emake check test
+}