[pkgsrc/trunk]: pkgsrc/benchmarks/sysbench Changes 0.4.12:

[adam <adam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/3bdfc28bbb25
branches:  trunk
changeset: 575974:3bdfc28bbb25
user:      adam <adam%pkgsrc.org@localhost>
date:      Thu May 27 10:49:07 2010 +0000

description:
Changes 0.4.12:
* Made forced shutdown introduced in 0.4.11 optional via the --forced-shutdown
  switch and off by default.

Changes 0.4.11:
* Added --oltp-reconnect-mode to the OLTP test.
* Minor fixes to remove compiler warnings and DocBook processing on Mac OS X.
* Added forced test shutdown to avoid endless execution when DB server freezes
* Backport of Windows support from the 0.5 branch

Changes 0.4.10:
* Fixed the bug with empty --mysql-create-options
* Merge two patches from Tim Cook:
- use lrand48() as random() is not thread-safe on most platforms
- use libumem/mtmalloc for memory allocation if available on the target platform
* Got rid of some unnecessary malloc() calls in drv_mysql.c

diffstat:

 benchmarks/sysbench/Makefile         |  15 ++++++++-------
 benchmarks/sysbench/distinfo         |  10 +++++-----
 benchmarks/sysbench/options.mk       |   6 +++---
 benchmarks/sysbench/patches/patch-aa |   6 +++---
 4 files changed, 19 insertions(+), 18 deletions(-)

diffs (83 lines):

diff -r 6e45fa06cdf8 -r 3bdfc28bbb25 benchmarks/sysbench/Makefile
--- a/benchmarks/sysbench/Makefile      Wed May 26 22:19:02 2010 +0000
+++ b/benchmarks/sysbench/Makefile      Thu May 27 10:49:07 2010 +0000
@@ -1,15 +1,16 @@
-# $NetBSD: Makefile,v 1.4 2007/12/21 22:30:22 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2010/05/27 10:49:07 adam Exp $
 
-DISTNAME=              sysbench-0.4.8
-CATEGORIES=            benchmarks
-MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=sysbench/}
+DISTNAME=      sysbench-0.4.12
+CATEGORIES=    benchmarks
+MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=sysbench/}
 
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://sysbench.sourceforge.net/
-COMMENT=               Modular, cross-platform and multi-threaded benchmark tool
+MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=      http://sysbench.sourceforge.net/
+COMMENT=       Modular, cross-platform and multi-threaded benchmark tool
 
 PKG_DESTDIR_SUPPORT=   user-destdir
 
+USE_LIBTOOL=           yes
 GNU_CONFIGURE=         yes
 PTHREAD_AUTO_VARS=     yes
 MAKE_FLAGS+=           bin_SCRIPTS= # don't install problematic scripts
diff -r 6e45fa06cdf8 -r 3bdfc28bbb25 benchmarks/sysbench/distinfo
--- a/benchmarks/sysbench/distinfo      Wed May 26 22:19:02 2010 +0000
+++ b/benchmarks/sysbench/distinfo      Thu May 27 10:49:07 2010 +0000
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.1.1.1 2007/03/05 15:55:25 rmind Exp $
+$NetBSD: distinfo,v 1.2 2010/05/27 10:49:07 adam Exp $
 
-SHA1 (sysbench-0.4.8.tar.gz) = dbf77d98d9399eeecf0d9e81c72a28a5dee2cf58
-RMD160 (sysbench-0.4.8.tar.gz) = a7d2686a5fe017b8d170fe438794462c1c5cd902
-Size (sysbench-0.4.8.tar.gz) = 469327 bytes
-SHA1 (patch-aa) = 5032e69d02c5d209c5858d729d55a5d52781f148
+SHA1 (sysbench-0.4.12.tar.gz) = 3f346e8b29b738711546970b027bbb7359d4672a
+RMD160 (sysbench-0.4.12.tar.gz) = b77c8bf31d84f075ec69ef3972afb8baed02e6bc
+Size (sysbench-0.4.12.tar.gz) = 421932 bytes
+SHA1 (patch-aa) = ffaa80909d0d2dc3200fc4ad2911573ef3396d86
diff -r 6e45fa06cdf8 -r 3bdfc28bbb25 benchmarks/sysbench/options.mk
--- a/benchmarks/sysbench/options.mk    Wed May 26 22:19:02 2010 +0000
+++ b/benchmarks/sysbench/options.mk    Thu May 27 10:49:07 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.3 2007/03/11 01:37:56 rmind Exp $
+# $NetBSD: options.mk,v 1.4 2010/05/27 10:49:07 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sysbench
 PKG_SUPPORTED_OPTIONS+= mysql pgsql doc
@@ -6,14 +6,14 @@
 .include "../../mk/bsd.options.mk"
 
 .if !empty(PKG_OPTIONS:Mmysql)
-CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client:Q}
+CONFIGURE_ARGS+=       --with-mysql=${BUILDLINK_PREFIX.mysql-client}
 .  include "../../mk/mysql.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-mysql
 .endif
 
 .if !empty(PKG_OPTIONS:Mpgsql)
-CONFIGURE_ARGS+=       --with-pgsql=${PGSQL_PREFIX:Q}
+CONFIGURE_ARGS+=       --with-pgsql=${PGSQL_PREFIX}
 .  include "../../mk/pgsql.buildlink3.mk"
 .else
 CONFIGURE_ARGS+=       --without-pgsql
diff -r 6e45fa06cdf8 -r 3bdfc28bbb25 benchmarks/sysbench/patches/patch-aa
--- a/benchmarks/sysbench/patches/patch-aa      Wed May 26 22:19:02 2010 +0000
+++ b/benchmarks/sysbench/patches/patch-aa      Thu May 27 10:49:07 2010 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.1.1.1 2007/03/05 15:55:25 rmind Exp $
+$NetBSD: patch-aa,v 1.2 2010/05/27 10:49:08 adam Exp $
 
---- sysbench/drivers/mysql/drv_mysql.c.orig    2006-10-11 04:22:51.000000000 +0900
+--- sysbench/drivers/mysql/drv_mysql.c.orig    2009-03-15 12:42:04.000000000 +0000
 +++ sysbench/drivers/mysql/drv_mysql.c
-@@ -29,6 +29,7 @@
+@@ -32,6 +32,7 @@
  # include <strings.h>
  #endif