CVS commit: pkgsrc/benchmarks/bonnie++

["Rin Okuyama" <rin%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rin
Date:           Sat Nov 20 05:57:29 UTC 2021

Modified Files:
        pkgsrc/benchmarks/bonnie++: Makefile distinfo
Added Files:
        pkgsrc/benchmarks/bonnie++/patches: patch-Makefile.in
            patch-bon_time.cpp patch-configure
Removed Files:
        pkgsrc/benchmarks/bonnie++/patches: patch-ab

Log Message:
bonnie++: Bump revision.

- Fix RELRO support.
- Cast double variable into int when printf with %d.
- Rename patch-ab to patch-Makefile.in.


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/benchmarks/bonnie++/Makefile
cvs rdiff -u -r1.15 -r1.16 pkgsrc/benchmarks/bonnie++/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/benchmarks/bonnie++/patches/patch-Makefile.in \
    pkgsrc/benchmarks/bonnie++/patches/patch-bon_time.cpp \
    pkgsrc/benchmarks/bonnie++/patches/patch-configure
cvs rdiff -u -r1.6 -r0 pkgsrc/benchmarks/bonnie++/patches/patch-ab

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

Modified files:

Index: pkgsrc/benchmarks/bonnie++/Makefile
diff -u pkgsrc/benchmarks/bonnie++/Makefile:1.42 pkgsrc/benchmarks/bonnie++/Makefile:1.43
--- pkgsrc/benchmarks/bonnie++/Makefile:1.42    Sat Jul 10 01:43:57 2021
+++ pkgsrc/benchmarks/bonnie++/Makefile Sat Nov 20 05:57:28 2021
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.42 2021/07/10 01:43:57 markd Exp $
+# $NetBSD: Makefile,v 1.43 2021/11/20 05:57:28 rin Exp $
 #
 
 DISTNAME=      bonnie++-1.98
+PKGREVISION=   1
 CATEGORIES=    benchmarks
 MASTER_SITES=  http://www.coker.com.au/bonnie++/
 EXTRACT_SUFX=  .tgz

Index: pkgsrc/benchmarks/bonnie++/distinfo
diff -u pkgsrc/benchmarks/bonnie++/distinfo:1.15 pkgsrc/benchmarks/bonnie++/distinfo:1.16
--- pkgsrc/benchmarks/bonnie++/distinfo:1.15    Tue Oct 26 10:02:51 2021
+++ pkgsrc/benchmarks/bonnie++/distinfo Sat Nov 20 05:57:28 2021
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.15 2021/10/26 10:02:51 nia Exp $
+$NetBSD: distinfo,v 1.16 2021/11/20 05:57:28 rin Exp $
 
 BLAKE2s (bonnie++-1.98.tgz) = 18bd3fd99055e0dd2e09e534400a9f8d00fc4a12a631e996eb76aa52c41622f1
 SHA512 (bonnie++-1.98.tgz) = 3cf70be4a20c58c80e29a140ec6d3c3884f1b4101e0fb63da0ea831fe4a5eb4e275bda2ce4eaf7d9c2bfb65742e985249b491cda8bdad85984a62f2fc19756c0
 Size (bonnie++-1.98.tgz) = 100339 bytes
-SHA1 (patch-ab) = 18756a4f3efaf8d478c3edc5be424c099c47e374
+SHA1 (patch-Makefile.in) = f5a63ab563236d1ab530a5e65120b254afcec9f7
 SHA1 (patch-bon__io.cpp) = 2ce4504424c8fbf88ee5d1eb21e3556f541a05f4
 SHA1 (patch-bon_csv2html.cpp) = 98a9336418b38b8ff56824155e370bd294c251fd
+SHA1 (patch-bon_time.cpp) = ccff7d0b8e19da3c1faf7ef0c05f6bec7a757f04
+SHA1 (patch-configure) = 8ab35b98bc88d1928eb9b405746bd2429ca2ad5c
 SHA1 (patch-port.h.in) = 089d93456efab27a91d5574ed6b8f5956a734620

Added files:

Index: pkgsrc/benchmarks/bonnie++/patches/patch-Makefile.in
diff -u /dev/null pkgsrc/benchmarks/bonnie++/patches/patch-Makefile.in:1.1
--- /dev/null   Sat Nov 20 05:57:29 2021
+++ pkgsrc/benchmarks/bonnie++/patches/patch-Makefile.in        Sat Nov 20 05:57:29 2021
@@ -0,0 +1,63 @@
+$NetBSD: patch-Makefile.in,v 1.1 2021/11/20 05:57:29 rin Exp $
+
+- DESTDIR support
+- CFLAGS and LDFLAGS support for large file and relro
+
+--- Makefile.in.orig   2008-12-31 06:04:25.000000000 +0900
++++ Makefile.in        2021-11-17 19:42:27.075733292 +0900
+@@ -9,10 +9,11 @@
+ eprefix=@exec_prefix@
+ #MORE_WARNINGS=-Weffc++
+ WFLAGS=-Wall -W -Wshadow -Wpointer-arith -Wwrite-strings -pedantic -ffor-scope -Wcast-align -Wsign-compare -Wpointer-arith -Wwrite-strings -Wformat-security -Wswitch-enum -Winit-self 
$(MORE_WARNINGS)
+-CFLAGS=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS)
+-CXX=@CXX@ $(CFLAGS)
+-LINK=@CXX@
+-THREAD_LFLAGS=@thread_ldflags@
++CFLAGS+=-O2 @debug@ -DNDEBUG $(WFLAGS) $(MORECFLAGS)
++LDFLAGS=@LDFLAGS@
++CXX=@CXX@ $(CFLAGS) $(LDFLAGS)
++LINK=@CXX@ $(LDFLAGS)
++THREAD_LDFLAGS=@thread_ldflags@
+ 
+ INSTALL=@INSTALL@
+ INSTALL_PROGRAM=@INSTALL_PROGRAM@
+@@ -34,13 +35,13 @@
+ GETCHOBJS=$(GETCHSRC:.cpp=.o)
+ 
+ bonnie++: $(BONOBJS)
+-      $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LFLAGS)
++      $(LINK) -o bonnie++ $(BONOBJS) $(THREAD_LDFLAGS)
+ 
+ zcav: $(ZCAVOBJS)
+-      $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LFLAGS)
++      $(LINK) -o zcav $(ZCAVOBJS) $(THREAD_LDFLAGS)
+ 
+ getc_putc: $(GETCOBJS) getc_putc_helper
+-      $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LFLAGS)
++      $(LINK) -o getc_putc $(GETCOBJS) $(THREAD_LDFLAGS)
+ 
+ getc_putc_helper: $(GETCHOBJS)
+       $(CXX) -o getc_putc_helper $(GETCHOBJS)
+@@ -52,15 +53,15 @@
+       $(LINK) generate_randfile.o -o generate_randfile
+ 
+ install-bin: $(EXE) $(EXES)
+-      mkdir -p $(eprefix)/bin $(eprefix)/sbin
+-      @INSTALL_PROGRAM@ @stripping@ $(EXES) $(eprefix)/sbin
+-      @INSTALL_PROGRAM@ @stripping@ $(EXE) $(eprefix)/bin
+-      @INSTALL_SCRIPT@ $(SCRIPTS) $(eprefix)/bin
++      mkdir -p $(eprefix)/bin ${DESTDIR}$(eprefix)/sbin
++      @INSTALL_PROGRAM@ @stripping@ $(EXES) ${DESTDIR}$(eprefix)/sbin
++      @INSTALL_PROGRAM@ @stripping@ $(EXE) ${DESTDIR}$(eprefix)/bin
++      @INSTALL_SCRIPT@ $(SCRIPTS) ${DESTDIR}$(eprefix)/bin
+ 
+ install: install-bin
+-      mkdir -p @mandir@/man1 @mandir@/man8
+-      @INSTALL_DATA@ $(MAN1) @mandir@/man1
+-      @INSTALL_DATA@ $(MAN8) @mandir@/man8
++      mkdir -p @mandir@/man1 ${DESTDIR}@mandir@/man8
++      @INSTALL_DATA@ $(MAN1) ${DESTDIR}@mandir@/man1
++      @INSTALL_DATA@ $(MAN8) ${DESTDIR}@mandir@/man8
+ 
+ %.o: %.cpp
+       $(CXX) -c $<
Index: pkgsrc/benchmarks/bonnie++/patches/patch-bon_time.cpp
diff -u /dev/null pkgsrc/benchmarks/bonnie++/patches/patch-bon_time.cpp:1.1
--- /dev/null   Sat Nov 20 05:57:29 2021
+++ pkgsrc/benchmarks/bonnie++/patches/patch-bon_time.cpp       Sat Nov 20 05:57:29 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-bon_time.cpp,v 1.1 2021/11/20 05:57:29 rin Exp $
+
+Cast double variable into int when printf with %d.
+
+--- bon_time.cpp.orig  2021-11-18 11:35:23.646872320 +0900
++++ bon_time.cpp       2021-11-18 11:36:15.386982308 +0900
+@@ -146,7 +146,7 @@ int BonTimer::print_stat(tests_t test, i
+         }
+         else
+         {
+-          fprintf(m_fp, " %5d", stat);
++          fprintf(m_fp, " %5d", (int)stat);
+         }
+       }
+       else
Index: pkgsrc/benchmarks/bonnie++/patches/patch-configure
diff -u /dev/null pkgsrc/benchmarks/bonnie++/patches/patch-configure:1.1
--- /dev/null   Sat Nov 20 05:57:29 2021
+++ pkgsrc/benchmarks/bonnie++/patches/patch-configure  Sat Nov 20 05:57:29 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-configure,v 1.1 2021/11/20 05:57:29 rin Exp $
+
+Do not clobber LDFLAGS.
+
+--- configure.orig     2018-09-13 22:07:36.000000000 +0900
++++ configure  2021-11-17 19:51:35.412026321 +0900
+@@ -3963,8 +3963,6 @@
+    linux_pthread="#define LINUX_PTHREAD"
+ fi
+ 
+-LDFLAGS=-lpthread
+-
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h.  */
+ #include <pthread.h>