app-benchmarks/tiobench: 0.4.2 version bump, fix build w/ GCC-5

Gentoo-bug: 520986, 570842
* Also fix perl shebangs to be more portable

Package-Manager: portage-2.3.0
Closes: https://github.com/gentoo/gentoo/pull/2878

2 files changed, 99 insertions, 0 deletions

diff --git a/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch b/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch
new file mode 100644
index 000000000000..900472d80dd2
--- /dev/null
+++ b/app-benchmarks/tiobench/files/tiobench-0.4.2-fix-perl-shebang.patch
@@ -0,0 +1,51 @@
+Fix perl shebangs, in order to be maximally compatible with Gentoo Prefix.
+Rationale: https://blogs.gentoo.org/mgorny/2016/02/08/a-quick-note-on-portable-shebangs/
+
+--- a/scripts/makeimages.pl
++++ b/scripts/makeimages.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ 
+ #    Author: James Manning <jmm@users.sf.net>
+ #       This software may be used and distributed according to the terms of
+@@ -8,6 +8,7 @@
+ #       Perl wrapper for calling tiobench.pl and displaying results
+ #       graphically using gnuplot
+ 
++use warnings;
+ use strict;
+ 
+ my $args = join(" ",@ARGV);
+--- a/scripts/tiosum.pl
++++ b/scripts/tiosum.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ #    Author: Randy Hron <rwhron (at) earthlink dot net>
+ #       This software may be used and distributed according to the terms of
+ #       the GNU General Public License, http://www.gnu.org/copyleft/gpl.html
+@@ -6,6 +6,7 @@
+ #     Summarize output of tiobench2.pl for multiple kernels/runs.
+ #       Assumes logfiles created with: 
+ #       ./tiobench2.pl > tiobench-`uname -r` 2> tiobench-`uname -r`.err
++use warnings;
+ use strict;
+ $|++;
+ 
+--- a/tiobench.pl
++++ b/tiobench.pl
+@@ -1,4 +1,4 @@
+-#!/usr/bin/perl -w
++#!/usr/bin/env perl
+ 
+ #    Author: James Manning <jmm at users.sf.net>
+ #    Author: Randy Hron <rwhron at earthlink dot net>
+@@ -9,6 +9,7 @@
+ #       Perl wrapper for calling the tiotest executable multiple times
+ #       with varying sets of parameters as instructed
+ 
++use warnings;
+ use strict;
+ use Getopt::Long;
+ 
diff --git a/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch b/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch
new file mode 100644
index 000000000000..e1bf89b87ec3
--- /dev/null
+++ b/app-benchmarks/tiobench/files/tiobench-0.4.2-gcc5.patch
@@ -0,0 +1,48 @@
+diff --git a/crc32.c b/crc32.c
+index bae7384..a22fc5d 100644
+--- a/crc32.c
++++ b/crc32.c
+@@ -72,10 +72,9 @@ static const unsigned long crctab[256] = {
+   0xA2F33668, 0xBCB4666D, 0xB8757BDA, 0xB5365D03, 0xB1F740B4
+ };
+ 
+-inline
+-unsigned long crc32(  const void* buffer, 
+-		      unsigned long length, 
+-		      unsigned long crc)
++unsigned long crc32(const void* buffer,
++		    unsigned long length,
++		    unsigned long crc)
+ {
+       const unsigned char* cp = (const unsigned char*)buffer;
+ 
+diff --git a/crc32.h b/crc32.h
+index 62b3433..cb9b96f 100644
+--- a/crc32.h
++++ b/crc32.h
+@@ -18,9 +18,8 @@
+ #ifndef CRC32_H
+ #define CRC32_H
+ 
+-inline 
+-unsigned long crc32( const void* const buffer, 
+-		      unsigned long length, 
+-		      unsigned long crc);
++unsigned long crc32(const void* const buffer,
++		    unsigned long length,
++		    unsigned long crc);
+ 
+ #endif
+diff --git a/tiotest.c b/tiotest.c
+index c23ceb4..bb73fcb 100644
+--- a/tiotest.c
++++ b/tiotest.c
+@@ -1392,7 +1392,7 @@ static int do_mmap_read_operation(void *loc, ThreadData *d)
+ 
+ 		if(crc != d->bufferCrc)
+ 		{
+-			fprintf(stderr, "Thread(%lu) mmap consistency check failed at 0x%x\n", d->myNumber, (unsigned int)loc);
++			fprintf(stderr, "Thread(%lu) mmap consistency check failed at 0x%p\n", d->myNumber, loc);
+ 			return -1;
+ 		}
+ 	}