pkgsrc-Changes archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/benchmarks/sysbench



Module Name:    pkgsrc
Committed By:   adam
Date:           Mon May 11 09:23:51 UTC 2026

Modified Files:
        pkgsrc/benchmarks/sysbench: Makefile PLIST distinfo options.mk
Added Files:
        pkgsrc/benchmarks/sysbench/patches: patch-m4_ax__check__docbook.m4
            patch-tests_Makefile.am
Removed Files:
        pkgsrc/benchmarks/sysbench/patches: patch-aa

Log Message:
sysbench: updated to 1.0.20

1.0.20
* build/CI/packaging: Add arm64 to Travis CI matrix
* build/CI/packaging: add Ubuntu Focal
* build/CI/packaging: remove Fedora Rawhide from CI matrix
* build/CI/packaging: fix regression tests to work with MySQL 8.0.19+
* build/CI/packaging: fix macOS builds in Travis
* build/CI/packaging: remove Ubuntu Disco (EOL)


To generate a diff of this commit:
cvs rdiff -u -r1.29 -r1.30 pkgsrc/benchmarks/sysbench/Makefile
cvs rdiff -u -r1.4 -r1.5 pkgsrc/benchmarks/sysbench/PLIST
cvs rdiff -u -r1.5 -r1.6 pkgsrc/benchmarks/sysbench/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/benchmarks/sysbench/options.mk
cvs rdiff -u -r1.2 -r0 pkgsrc/benchmarks/sysbench/patches/patch-aa
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/benchmarks/sysbench/patches/patch-m4_ax__check__docbook.m4 \
    pkgsrc/benchmarks/sysbench/patches/patch-tests_Makefile.am

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/benchmarks/sysbench/Makefile
diff -u pkgsrc/benchmarks/sysbench/Makefile:1.29 pkgsrc/benchmarks/sysbench/Makefile:1.30
--- pkgsrc/benchmarks/sysbench/Makefile:1.29    Wed Jan  7 08:45:56 2026
+++ pkgsrc/benchmarks/sysbench/Makefile Mon May 11 09:23:51 2026
@@ -1,27 +1,35 @@
-# $NetBSD: Makefile,v 1.29 2026/01/07 08:45:56 wiz Exp $
+# $NetBSD: Makefile,v 1.30 2026/05/11 09:23:51 adam Exp $
 
-DISTNAME=      sysbench-0.4.12
-PKGREVISION=   20
+DISTNAME=      sysbench-1.0.20
 CATEGORIES=    benchmarks
-MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE:=sysbench/}
+MASTER_SITES=  ${MASTER_SITE_GITHUB:=akopytov/}
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=      https://launchpad.net/sysbench/
+HOMEPAGE=      https://github.com/akopytov/sysbench
 COMMENT=       Modular, cross-platform and multi-threaded benchmark tool
+LICENSE=       gnu-gpl-v2
+
+TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
+TOOL_DEPENDS+= libxslt-[0-9]*:../../textproc/libxslt # xsltproc
 
 USE_LIBTOOL=           yes
+USE_TOOLS+=            aclocal autoconf autoheader automake gmake pkg-config
 GNU_CONFIGURE=         yes
+CONFIGURE_ARGS+=       --with-system-ck
+CONFIGURE_ARGS+=       --with-system-luajit
+CONFIGURE_ENV+=                DOCBOOK_ROOT=${PREFIX}/share/xsl/docbook/xhtml
+CONFIGURE_ENV+=                XML_CATALOG=${PREFIX}/share/xml/catalog
 PTHREAD_AUTO_VARS=     yes
-MAKE_FLAGS+=           bin_SCRIPTS= # don't install problematic scripts
 
-CFLAGS.NetBSD+=                -D_NETBSD_SOURCE # hack for ulong along with patch-aa
+CHECK_INTERPRETER_SKIP+=       share/sysbench/*.lua
 
-.include "../../mk/compiler.mk"
-.if !empty(MACHINE_PLATFORM:MSunOS-5.1[0-9]-*) && \
-    !empty(CC_VERSION:Mgcc-4.[6-9].*)
-BUILDLINK_TRANSFORM+=  rm:-D_XOPEN_SOURCE=500
-.endif
+pre-configure:
+       cd ${WRKSRC} && libtoolize -f && aclocal && autoheader && \
+               automake -a --foreign && autoconf
 
 .include "options.mk"
+
+.include "../../devel/concurrencykit/buildlink3.mk"
+.include "../../lang/LuaJIT2/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/benchmarks/sysbench/PLIST
diff -u pkgsrc/benchmarks/sysbench/PLIST:1.4 pkgsrc/benchmarks/sysbench/PLIST:1.5
--- pkgsrc/benchmarks/sysbench/PLIST:1.4        Sun Jun 14 17:33:12 2009
+++ pkgsrc/benchmarks/sysbench/PLIST    Mon May 11 09:23:51 2026
@@ -1,3 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2009/06/14 17:33:12 joerg Exp $
+@comment $NetBSD: PLIST,v 1.5 2026/05/11 09:23:51 adam Exp $
 bin/sysbench
 share/doc/sysbench/manual.html
+share/sysbench/bulk_insert.lua
+share/sysbench/oltp_common.lua
+share/sysbench/oltp_delete.lua
+share/sysbench/oltp_insert.lua
+share/sysbench/oltp_point_select.lua
+share/sysbench/oltp_read_only.lua
+share/sysbench/oltp_read_write.lua
+share/sysbench/oltp_update_index.lua
+share/sysbench/oltp_update_non_index.lua
+share/sysbench/oltp_write_only.lua
+share/sysbench/select_random_points.lua
+share/sysbench/select_random_ranges.lua

Index: pkgsrc/benchmarks/sysbench/distinfo
diff -u pkgsrc/benchmarks/sysbench/distinfo:1.5 pkgsrc/benchmarks/sysbench/distinfo:1.6
--- pkgsrc/benchmarks/sysbench/distinfo:1.5     Tue Oct 26 10:02:55 2021
+++ pkgsrc/benchmarks/sysbench/distinfo Mon May 11 09:23:51 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:02:55 nia Exp $
+$NetBSD: distinfo,v 1.6 2026/05/11 09:23:51 adam Exp $
 
-BLAKE2s (sysbench-0.4.12.tar.gz) = fb71ced9027639eb503dd792c68694db5fc167f47a989b09fa9d36a0f6d688df
-SHA512 (sysbench-0.4.12.tar.gz) = e5903a38c89ac850e7e8af6bba6a5311f8c14ab579eff794f9a7688f41804e8b53a8ababd4d1ea1c69625d53d9fe47842d123a6bc2c5fd74ffcac5bac488abbe
-Size (sysbench-0.4.12.tar.gz) = 421932 bytes
-SHA1 (patch-aa) = ffaa80909d0d2dc3200fc4ad2911573ef3396d86
+BLAKE2s (sysbench-1.0.20.tar.gz) = 2bd4dab7f41b59b898521bc0362ea1a18d8fa648a5678e2a57477d10673c76b2
+SHA512 (sysbench-1.0.20.tar.gz) = 510453f26c4304eee74cff82a99356b668478f97eaf942fa3654a27692743b52d39dda526fa8d136568b5ad136157c8658ae5eb2ae4e8593b161dcd49621f24f
+Size (sysbench-1.0.20.tar.gz) = 1509630 bytes
+SHA1 (patch-m4_ax__check__docbook.m4) = 5bc160ca0ad4a98be1154654970ce5df7a320617
+SHA1 (patch-tests_Makefile.am) = 147a08552f98925a463f76c6699bd03cb2160828

Index: pkgsrc/benchmarks/sysbench/options.mk
diff -u pkgsrc/benchmarks/sysbench/options.mk:1.6 pkgsrc/benchmarks/sysbench/options.mk:1.7
--- pkgsrc/benchmarks/sysbench/options.mk:1.6   Tue Jun  6 12:40:18 2023
+++ pkgsrc/benchmarks/sysbench/options.mk       Mon May 11 09:23:51 2026
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.6 2023/06/06 12:40:18 riastradh Exp $
+# $NetBSD: options.mk,v 1.7 2026/05/11 09:23:51 adam Exp $
 
 PKG_OPTIONS_VAR=       PKG_OPTIONS.sysbench
-PKG_SUPPORTED_OPTIONS+=        mysql pgsql doc
+PKG_SUPPORTED_OPTIONS+=        mysql pgsql
 
 .include "../../mk/bsd.options.mk"
 
@@ -18,8 +18,3 @@ CONFIGURE_ARGS+=      --with-pgsql=${PGSQL_PR
 .else
 CONFIGURE_ARGS+=       --without-pgsql
 .endif
-
-.if !empty(PKG_OPTIONS:Mdoc)
-.  include "../../textproc/libxslt/buildlink3.mk"
-TOOL_DEPENDS+= docbook-xsl-[0-9]*:../../textproc/docbook-xsl
-.endif

Added files:

Index: pkgsrc/benchmarks/sysbench/patches/patch-m4_ax__check__docbook.m4
diff -u /dev/null pkgsrc/benchmarks/sysbench/patches/patch-m4_ax__check__docbook.m4:1.1
--- /dev/null   Mon May 11 09:23:52 2026
+++ pkgsrc/benchmarks/sysbench/patches/patch-m4_ax__check__docbook.m4   Mon May 11 09:23:51 2026
@@ -0,0 +1,38 @@
+$NetBSD: patch-m4_ax__check__docbook.m4,v 1.1 2026/05/11 09:23:51 adam Exp $
+
+Don't look for dockbook in non-existent places.
+
+--- m4/ax_check_docbook.m4.orig        2026-05-11 08:37:32.516953600 +0000
++++ m4/ax_check_docbook.m4
+@@ -7,31 +7,8 @@ dnl ------------------------------------
+ AC_DEFUN([AX_CHECK_DOCBOOK], [
+ # It's just rude to go over the net to build
+ XSLTPROC_FLAGS=--nonet
+-DOCBOOK_ROOT=
+ 
+-for i in /etc/xml/catalog /usr/local/etc/xml/catalog /opt/local/etc/xml/catalog ;
+-do
+-      if test -f $i; then
+-              XML_CATALOG="$i"
+-      fi
+-done
+ 
+-if test -z "$XML_CATALOG" ; then
+-      for i in /usr/share/sgml/docbook/stylesheet/xsl/nwalsh /usr/share/sgml/docbook/xsl-stylesheets/ /opt/local/share/xsl/docbook-xsl/xhtml/ ;
+-      do
+-              if test -d "$i"; then
+-                      DOCBOOK_ROOT=$i
+-              fi
+-      done
+-
+-      # Last resort - try net
+-      if test -z "$DOCBOOK_ROOT"; then
+-              XSLTPROC_FLAGS=
+-      fi
+-else
+-      CAT_ENTRY_START='<!--'
+-      CAT_ENTRY_END='-->'
+-fi
+ 
+ AC_CHECK_PROG(XSLTPROC,xsltproc,xsltproc,)
+ XSLTPROC_WORKS=no
Index: pkgsrc/benchmarks/sysbench/patches/patch-tests_Makefile.am
diff -u /dev/null pkgsrc/benchmarks/sysbench/patches/patch-tests_Makefile.am:1.1
--- /dev/null   Mon May 11 09:23:52 2026
+++ pkgsrc/benchmarks/sysbench/patches/patch-tests_Makefile.am  Mon May 11 09:23:51 2026
@@ -0,0 +1,27 @@
+$NetBSD: patch-tests_Makefile.am,v 1.1 2026/05/11 09:23:51 adam Exp $
+
+Don't install tests.
+
+--- tests/Makefile.am.orig     2020-04-24 15:51:47.000000000 +0000
++++ tests/Makefile.am
+@@ -20,7 +20,6 @@ AM_TESTS_ENVIRONMENT = \
+ 
+ TESTS = test_run.sh
+ 
+-test_SCRIPTS = test_run.sh
+ 
+ EXTRA_DIST = $(test_SCRIPTS) \
+              README.md
+@@ -46,12 +45,6 @@ install_test_files:
+         done \
+       done
+ 
+-dist-hook:
+-      $(MAKE) INSTALL_TO_DIR="$(distdir)" install_test_files
+-
+-install-data-local:
+-      $(MAKE) INSTALL_TO_DIR="$(DESTDIR)$(testdir)" install_test_files
+-
+ uninstall-local:
+       rm -f -r $(DESTDIR)$(testdir)
+ 



Home | Main Index | Thread Index | Old Index