From 99700879f3b43a025f5b853e8630bd2b6ae321dc Mon Sep 17 00:00:00 2001
From: Martijn Braam <martijn@brixit.nl>
Date: Tue, 22 Jan 2019 00:52:36 +0100
Subject: [PATCH] main/unixbench: Upgrade to latest git master (!166)

Upgrade unixbench to git master instead of the old git tag I've used.
New version has way better way to check core count on ARM machines.
---
 main/unixbench/APKBUILD                           | 15 +++++----------
 .../unixbench/modern_compiler_optimizations.patch | 12 ------------
 ...asonable_multicore-whetstone_results_fix.patch | 12 ------------
 main/unixbench/use_volatile.patch                 | 11 -----------
 4 files changed, 5 insertions(+), 45 deletions(-)
 delete mode 100644 main/unixbench/modern_compiler_optimizations.patch
 delete mode 100644 main/unixbench/unreasonable_multicore-whetstone_results_fix.patch
 delete mode 100644 main/unixbench/use_volatile.patch

diff --git a/main/unixbench/APKBUILD b/main/unixbench/APKBUILD
index a4754c54d..e8794742b 100644
--- a/main/unixbench/APKBUILD
+++ b/main/unixbench/APKBUILD
@@ -1,5 +1,6 @@
 pkgname=unixbench
-pkgver=5.1.3
+pkgver=5.1.3_git20180129
+_commit=070030e09f6effdf0c6721e8fcc3a5c6fb5bed1a
 pkgrel=0
 pkgdesc="The original BYTE UNIX benchmark suite"
 url="https://github.com/kdlucas/byte-unixbench"
@@ -10,13 +11,10 @@ makedepends=""
 install=""
 options="!check"
 source="
-	${pkgname}-${pkgver}.tar.gz::https://github.com/kdlucas/byte-unixbench/archive/v${pkgver}.tar.gz
-	modern_compiler_optimizations.patch
-	unreasonable_multicore-whetstone_results_fix.patch
-	use_volatile.patch
+	${pkgname}-${pkgver}.tar.gz::https://github.com/kdlucas/byte-unixbench/archive/${_commit}.tar.gz
 	ubench
 "
-builddir="$srcdir/byte-unixbench-${pkgver}/UnixBench"
+builddir="$srcdir/byte-unixbench-${_commit}/UnixBench"
 
 build() {
 	cd "$builddir"
@@ -31,8 +29,5 @@ package() {
 	cp -a pgms testdir Makefile src ${pkgdir}/usr/share/unixbench
 }
 
-sha512sums="12a88f1606aba156e96b8addf9a6fbf1de4ddbb4b9163548554c16d78f4af167d148b27688b2e367cff01e9f8d776ff96c486577b5336c36686480f4002b4dce  unixbench-5.1.3.tar.gz
-5cee4101cb49c58d24e2dc453de5bac05e9f2f5e396d0220d5d811ea1b0ad67c009de4bddad1d62dbfb3491b0f6840058c571f67c21b41653e4301ab9fa27a04  modern_compiler_optimizations.patch
-831f466284336cb7462cadfd4440364ea7ed543b94dd559e58497a81b1d58e35d567fb8d13885245bea250b29ae187e58e139ea27010009243f541bc6cff7405  unreasonable_multicore-whetstone_results_fix.patch
-264de2ca75ef7d0977613f3dc86b8fcfbabb18bd3153214f5ba78aa256eed496f3ae88b4ebfc4399395db91fcb1bb5cd88acde735508c7fd38b4c88bfbf88bb7  use_volatile.patch
+sha512sums="ca4b7ab21eaacddcb99f9237998c42e2179d8e136e23dc0e4d9b2774f460588bc1851dbf0cdb9ad99bd485eb67434a74408f878f76a8ea5672615495ea074124  unixbench-5.1.3_git20180129.tar.gz
 91590bfaac3b118ad9a7ec66200ecc7b5ff88b84f5e8552c6b30fcc4436669eb4467d6b9a89d0be8682903e88b843fc4e40e3c7f90406c398449edb187ad6771  ubench"
diff --git a/main/unixbench/modern_compiler_optimizations.patch b/main/unixbench/modern_compiler_optimizations.patch
deleted file mode 100644
index 1ba5dc54a..000000000
--- a/main/unixbench/modern_compiler_optimizations.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN UnixBench/Makefile b/Makefile
---- a/Makefile	2015-08-15 01:52:22.539585616 -0600
-+++ b/Makefile	2015-08-15 02:00:13.772259951 -0600
-@@ -71,7 +71,7 @@
- #	-m386 -malign-loops=1 -malign-jumps=1 -malign-functions=1
- 
- ## For Solaris 2, or general-purpose GCC 2.7.x
--OPTON = -O2 -fomit-frame-pointer -fforce-addr -ffast-math -Wall
-+OPTON = -O2 -ffast-math -Wall -march=native
- 
- ## For Digital Unix v4.x, with DEC cc v5.x
- #OPTON = -O4
diff --git a/main/unixbench/unreasonable_multicore-whetstone_results_fix.patch b/main/unixbench/unreasonable_multicore-whetstone_results_fix.patch
deleted file mode 100644
index 2e4537150..000000000
--- a/main/unixbench/unreasonable_multicore-whetstone_results_fix.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN UnixBench/Makefile b/Makefile
---- a/Makefile	2015-06-04 11:20:18.000000000 -0600
-+++ b/Makefile	2015-08-15 01:47:44.310787298 -0600
-@@ -196,7 +196,7 @@
- $(PROGDIR)/double: $(SRCDIR)/arith.c
- 	$(CC) -o $(PROGDIR)/double ${CFLAGS} ${OPTON} -Ddatum=double $(SRCDIR)/arith.c
- $(PROGDIR)/whetstone-double: $(SRCDIR)/whets.c
--	$(CC) -o $(PROGDIR)/whetstone-double ${CFLAGS} ${OPTON} -DDP -DUNIX -DUNIXBENCH $(SRCDIR)/whets.c -lm
-+	$(CC) -o $(PROGDIR)/whetstone-double ${CFLAGS} ${OPTON} -DDP -DGTODay -DUNIXBENCH $(SRCDIR)/whets.c -lm
- $(PROGDIR)/hanoi: $(SRCDIR)/hanoi.c
- 	$(CC) -o $(PROGDIR)/hanoi ${CFLAGS} ${OPTON} $(SRCDIR)/hanoi.c
- 
diff --git a/main/unixbench/use_volatile.patch b/main/unixbench/use_volatile.patch
deleted file mode 100644
index 739a9b291..000000000
--- a/main/unixbench/use_volatile.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- b/src/arith.c	2011-01-17 23:44:53.000000000 -0700
-+++ a/src/arith.c	2015-03-21 20:38:49.082836753 -0600
-@@ -35,7 +35,7 @@
- 
- int dumb_stuff(int);
- 
--unsigned long iter;
-+unsigned volatile long iter;
- 
- /* this function is called when the alarm expires */
- void report()