unixbench: update to 5.1.3.20161028.
This commit is contained in:
Andrea Brancaleoni
parent
b103456e83
commit
a97237dd6e
|
|
@ -1,17 +1,17 @@
|
|||
From 97f206220ef4047551e079dd8d6105ce47cdb2c4 Mon Sep 17 00:00:00 2001
|
||||
From 659ebeb12cbfa4035649f0a68d4be78fc0009eff Mon Sep 17 00:00:00 2001
|
||||
From: Andrea Brancaleoni <miwaxe@gmail.com>
|
||||
Date: Mon, 24 Oct 2016 15:07:29 +0200
|
||||
Subject: [PATCH] install
|
||||
|
||||
---
|
||||
UnixBench/Makefile | 61 ++++++++++++++++++++++++++++++-------------------
|
||||
UnixBench/Run | 40 ++++++++++----------------------
|
||||
UnixBench/Makefile | 29 ++++++++++++++++++++++-------
|
||||
UnixBench/Run | 42 ++++++++++++++----------------------------
|
||||
UnixBench/pgms/multi.sh | 2 +-
|
||||
UnixBench/src/execl.c | 4 +---
|
||||
4 files changed, 52 insertions(+), 55 deletions(-)
|
||||
4 files changed, 38 insertions(+), 39 deletions(-)
|
||||
|
||||
diff --git a/UnixBench/Makefile b/UnixBench/Makefile
|
||||
index 880743a..16531c2 100644
|
||||
index 880743a..748a2a4 100644
|
||||
--- a/UnixBench/Makefile
|
||||
+++ b/UnixBench/Makefile
|
||||
@@ -141,12 +141,16 @@ BINS = $(PROGDIR)/arithoh $(PROGDIR)/register $(PROGDIR)/short \
|
||||
|
|
@ -36,73 +36,14 @@ index 880743a..16531c2 100644
|
|||
|
||||
# ######################### the big ALL ############################
|
||||
all:
|
||||
@@ -212,37 +216,37 @@ programs: $(BINS)
|
||||
# (dependencies could be generated by modern compilers,
|
||||
# but let's not assume modern compilers are present)
|
||||
$(PROGDIR)/%:
|
||||
- $(CC) -o $@ $(CFLAGS) $< $(LDFLAGS)
|
||||
+ $(CC) -o $@ $(CFLAGS) $(CDECL) $< $(LDFLAGS) $(LIBS)
|
||||
|
||||
# Individual programs
|
||||
# Sometimes the same source file is compiled in different ways.
|
||||
# This limits the 'make' patterns that can usefully be applied.
|
||||
|
||||
$(PROGDIR)/arithoh: $(SRCDIR)/arith.c $(SRCDIR)/timeit.c
|
||||
-$(PROGDIR)/arithoh: CFLAGS += -Darithoh
|
||||
+$(PROGDIR)/arithoh: CDECL += -Darithoh
|
||||
$(PROGDIR)/register: $(SRCDIR)/arith.c $(SRCDIR)/timeit.c
|
||||
-$(PROGDIR)/register: CFLAGS += -Ddatum='register int'
|
||||
+$(PROGDIR)/register: CDECL += -Ddatum='register int'
|
||||
$(PROGDIR)/short: $(SRCDIR)/arith.c $(SRCDIR)/timeit.c
|
||||
-$(PROGDIR)/short: CFLAGS += -Ddatum=short
|
||||
+$(PROGDIR)/short: CDECL += -Ddatum=short
|
||||
$(PROGDIR)/int: $(SRCDIR)/arith.c $(SRCDIR)/timeit.c
|
||||
-$(PROGDIR)/int: CFLAGS += -Ddatum=int
|
||||
+$(PROGDIR)/int: CDECL += -Ddatum=int
|
||||
$(PROGDIR)/long: $(SRCDIR)/arith.c $(SRCDIR)/timeit.c
|
||||
-$(PROGDIR)/long: CFLAGS += -Ddatum=long
|
||||
+$(PROGDIR)/long: CDECL += -Ddatum=long
|
||||
$(PROGDIR)/float: $(SRCDIR)/arith.c $(SRCDIR)/timeit.c
|
||||
-$(PROGDIR)/float: CFLAGS += -Ddatum=float
|
||||
+$(PROGDIR)/float: CDECL += -Ddatum=float
|
||||
$(PROGDIR)/double: $(SRCDIR)/arith.c $(SRCDIR)/timeit.c
|
||||
-$(PROGDIR)/double: CFLAGS += -Ddatum=double
|
||||
+$(PROGDIR)/double: CDECL += -Ddatum=double
|
||||
|
||||
$(PROGDIR)/poll: $(SRCDIR)/time-polling.c
|
||||
-$(PROGDIR)/poll: CFLAGS += -DUNIXBENCH -DHAS_POLL
|
||||
+$(PROGDIR)/poll: CDECL += -DUNIXBENCH -DHAS_POLL
|
||||
$(PROGDIR)/poll2: $(SRCDIR)/time-polling.c
|
||||
-$(PROGDIR)/poll2: CFLAGS += -DUNIXBENCH -DHAS_POLL2
|
||||
+$(PROGDIR)/poll2: CDECL += -DUNIXBENCH -DHAS_POLL2
|
||||
$(PROGDIR)/select: $(SRCDIR)/time-polling.c
|
||||
-$(PROGDIR)/select: CFLAGS += -DUNIXBENCH -DHAS_SELECT
|
||||
+$(PROGDIR)/select: CDECL += -DUNIXBENCH -DHAS_SELECT
|
||||
|
||||
$(PROGDIR)/whetstone-double: $(SRCDIR)/whets.c
|
||||
-$(PROGDIR)/whetstone-double: CFLAGS += -DDP -DGTODay -DUNIXBENCH
|
||||
-$(PROGDIR)/whetstone-double: LDFLAGS += -lm
|
||||
+$(PROGDIR)/whetstone-double: CDECL += -DDP -DGTODay -DUNIXBENCH
|
||||
+$(PROGDIR)/whetstone-double: LIBS += -lm
|
||||
|
||||
$(PROGDIR)/pipe: $(SRCDIR)/pipe.c $(SRCDIR)/timeit.c
|
||||
|
||||
@@ -261,17 +265,17 @@ $(PROGDIR)/context1: $(SRCDIR)/context1.c $(SRCDIR)/timeit.c
|
||||
$(PROGDIR)/looper: $(SRCDIR)/looper.c $(SRCDIR)/timeit.c
|
||||
|
||||
$(PROGDIR)/ubgears: $(SRCDIR)/ubgears.c
|
||||
-$(PROGDIR)/ubgears: LDFLAGS += -lm $(GL_LIBS)
|
||||
+$(PROGDIR)/ubgears: LIBS += -lm $(GL_LIBS)
|
||||
|
||||
-$(PROGDIR)/dhry2: CFLAGS += -DHZ=${HZ}
|
||||
+$(PROGDIR)/dhry2: CDECL += -DHZ=${HZ}
|
||||
@@ -266,12 +270,12 @@ $(PROGDIR)/ubgears: LDFLAGS += -lm $(GL_LIBS)
|
||||
$(PROGDIR)/dhry2: CFLAGS += -DHZ=${HZ}
|
||||
$(PROGDIR)/dhry2: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c \
|
||||
$(SRCDIR)/dhry.h $(SRCDIR)/timeit.c
|
||||
- $(CC) -o $@ ${CFLAGS} $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c
|
||||
+ $(CC) -o $@ ${CFLAGS} $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c $(LDFLAGS)
|
||||
|
||||
-$(PROGDIR)/dhry2reg: CFLAGS += -DHZ=${HZ} -DREG=register
|
||||
+$(PROGDIR)/dhry2reg: CDECL += -DHZ=${HZ} -DREG=register
|
||||
$(PROGDIR)/dhry2reg: CFLAGS += -DHZ=${HZ} -DREG=register
|
||||
$(PROGDIR)/dhry2reg: $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c \
|
||||
$(SRCDIR)/dhry.h $(SRCDIR)/timeit.c
|
||||
- $(CC) -o $@ ${CFLAGS} $(SRCDIR)/dhry_1.c $(SRCDIR)/dhry_2.c
|
||||
|
|
@ -127,7 +68,7 @@ index 880743a..16531c2 100644
|
|||
+
|
||||
## END ##
|
||||
diff --git a/UnixBench/Run b/UnixBench/Run
|
||||
index a16a5c9..a254b5c 100755
|
||||
index a16a5c9..80f2a8d 100755
|
||||
--- a/UnixBench/Run
|
||||
+++ b/UnixBench/Run
|
||||
@@ -7,7 +7,6 @@ use Time::HiRes;
|
||||
|
|
@ -162,7 +103,16 @@ index a16a5c9..a254b5c 100755
|
|||
|
||||
|
||||
############################################################################
|
||||
@@ -838,26 +840,6 @@ sub abortRun {
|
||||
@@ -593,6 +595,8 @@ sub logFile {
|
||||
# Use the date in the base file name.
|
||||
my $ymd = strftime "%Y-%m-%d", localtime;
|
||||
|
||||
+ system("mkdir -p $RESULTDIR");
|
||||
+
|
||||
while (1) {
|
||||
my $log = sprintf "%s/%s-%s-%02d",
|
||||
${RESULTDIR}, $sysInfo->{'name'}, $ymd, $count;
|
||||
@@ -838,26 +842,6 @@ sub abortRun {
|
||||
# TEST SETUP
|
||||
############################################################################
|
||||
|
||||
|
|
@ -189,7 +139,7 @@ index a16a5c9..a254b5c 100755
|
|||
# Parse the command arguments.
|
||||
sub parseArgs {
|
||||
my @words = @_;
|
||||
@@ -1031,7 +1013,7 @@ sub indexResults {
|
||||
@@ -1031,7 +1015,7 @@ sub indexResults {
|
||||
|
||||
# Read in the baseline result data. If we can't get it, just return
|
||||
# without making indexed results.
|
||||
|
|
@ -198,7 +148,7 @@ index a16a5c9..a254b5c 100755
|
|||
if (!defined($index)) {
|
||||
return;
|
||||
}
|
||||
@@ -1254,6 +1236,9 @@ sub runOnePass {
|
||||
@@ -1254,6 +1238,9 @@ sub runOnePass {
|
||||
|
||||
# Remember where we are, and move to the test directory.
|
||||
my $pwd = `pwd`;
|
||||
|
|
@ -208,7 +158,7 @@ index a16a5c9..a254b5c 100755
|
|||
chdir($TESTDIR);
|
||||
|
||||
# Execute N copies of the benchmark in parallel.
|
||||
@@ -1823,7 +1808,6 @@ sub main {
|
||||
@@ -1823,7 +1810,6 @@ sub main {
|
||||
$tests = $index;
|
||||
}
|
||||
|
||||
|
|
@ -216,7 +166,7 @@ index a16a5c9..a254b5c 100755
|
|||
my $systemInfo = getSystemInfo();
|
||||
|
||||
# If the number of copies to run was not set, set it to 1
|
||||
@@ -1837,7 +1821,7 @@ sub main {
|
||||
@@ -1837,7 +1823,7 @@ sub main {
|
||||
}
|
||||
|
||||
# Display the program banner.
|
||||
|
|
|
|||
|
|
@ -1,8 +1,8 @@
|
|||
# Template file for 'unixbench'
|
||||
pkgname=unixbench
|
||||
version=5.1.3.20161007
|
||||
version=5.1.3.20161028
|
||||
revision=1
|
||||
_commit=35efe5e575c6a5b46eccec1ae98dc52d8b0e169a
|
||||
_commit=aeed2ba662a9220089aee33be4123481dab0b524
|
||||
wrksrc="byte-$pkgname-$_commit"
|
||||
build_wrksrc="UnixBench"
|
||||
build_style=gnu-makefile
|
||||
|
|
@ -12,10 +12,11 @@ maintainer="Andrea Brancaleoni <miwaxe@gmail.com>"
|
|||
license="GPL-2"
|
||||
homepage="https://github.com/kdlucas/byte-unixbench"
|
||||
distfiles="$homepage/archive/$_commit.tar.gz"
|
||||
checksum=e0e8ec77d27c23db9fe92201e8abe9e835b988716601cb650d0c2f2d294b83a7
|
||||
checksum=48e6ed4e705c86e5481ddf0c0d5ef2850f84a0da7050d438dbfe1052c81fd93f
|
||||
|
||||
patch_args="-p1"
|
||||
|
||||
pre_build() {
|
||||
make clean
|
||||
do_build() {
|
||||
export CFLAGS=$CFLAGS
|
||||
make CC=$CC OPTON=
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue