From nobody Mon Jul 10 10:34:06 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R00jW0yGSz3cTxy; Mon, 10 Jul 2023 10:34:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R00jW0Qbzz3NTL; Mon, 10 Jul 2023 10:34:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688985247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HB20ehG6G4ux/2v3VQvDBpXjF56txpurPT0Ez/pQQik=; b=PQ9xDxWoskQkcLMAe91LZQkRDquXsKGBA5sJ25mGdo28dlHx93lcEgsdGLbPfTxeZrpJm9 8bKkrvXfWwGpbN/VI72hvJp4PnzmkNLFw6A2o+TVCt2ORbm5CujBHdqWf5Bh0QdgN0Lk4P lxcoyhOJvdQSg2t4G09bjN3THBv3H/ZWqeKUJNTiagA9L+RgLrwHI2oXq1rzS7+i64mE2A CLJhMH7D5un+g2LoEl3F445p6YlE/b1ZENE8DndCzLq8evKUQ4ZpY3nry8i4r7nr04qYg4 +41jMWprFak/vfVPKvbk8SkzozBQEvoehwJzBh9XAoTqpCItTeui+HA+eckKmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1688985247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HB20ehG6G4ux/2v3VQvDBpXjF56txpurPT0Ez/pQQik=; b=eiOmI4KiWk75J14mQNNgQ7KdFYVXLXGYtAwp7DLyBw5NFGBkXL6czXQ2npCLMM2Cj5zEjo 8KguB9ky70whl9J+46lnCriHpZpaQPhk+SJcwfg8V78IHfz0kSzg3eTHJ5hoMwFvlAsmi6 VxJuHd4dBYMGmfLW+fU40C8Y3u9sUI+A1KdSCQKxl0VW2cu4MLdLENEj39zXVx8vcwuGO0 BWtTNfUOzJBFyEUS7988Psk731AHCdHScYSzfL2ycA7bzXzIip7jqB8Mj/YeEFxuDJ/BHW DocA0MqR34HGCKKd9iQlw61xXWk62t4EaOUT/Nm9wQA8wLajJOVHNvQa5W03xA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1688985247; a=rsa-sha256; cv=none; b=ji/RdtDyCW1YmywHxwYWFSDYivvcuKH/kYfxcnNPGLOlvKhiFro8XUrRFKnNObrGC8Zi7G S5+WnSS63yGfN90HYvPVyAQCHuevz9BMkJADaFLlTiUAkj2HI4UHtGHQUpuiM22khZ2SPF BXFCzQo637pVMh0r2O0w5RweHRldJNKvNWeXnOVtj4bu8BWr0ep4TsAg91X2G1GwBO5Z/2 nX9LTLL2h+ZAXsJlgCByxKrLt+zB/lmDXhZ+s5eqvskPr8gpNbKp073IH2ItkEHORmdOiP PsEBH3wj67+8ZbaSTzeRkHWt54hxficedyAtAuGbPLv0CoUcEgwr2EUNTpvzGw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R00jV6cqbzhBY; Mon, 10 Jul 2023 10:34:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36AAY6ej075552; Mon, 10 Jul 2023 10:34:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36AAY6mX075551; Mon, 10 Jul 2023 10:34:06 GMT (envelope-from git) Date: Mon, 10 Jul 2023 10:34:06 GMT Message-Id: <202307101034.36AAY6mX075551@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ganael LAPLANCHE Subject: git: 765c4d803b22 - main - benchmarks/bonnie++: Fix build on -CURRENT List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: martymac X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 765c4d803b2253bca012b08759c521657e1d33ae Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by martymac: URL: https://cgit.FreeBSD.org/ports/commit/?id=765c4d803b2253bca012b08759c521657e1d33ae commit 765c4d803b2253bca012b08759c521657e1d33ae Author: Ganael LAPLANCHE AuthorDate: 2023-07-10 10:31:18 +0000 Commit: Ganael LAPLANCHE CommitDate: 2023-07-10 10:31:18 +0000 benchmarks/bonnie++: Fix build on -CURRENT While here, re-generate patches. --- benchmarks/bonnie++/Makefile | 1 + benchmarks/bonnie++/files/patch-bonnie++.cpp | 10 +++++----- benchmarks/bonnie++/files/patch-bonnie.h.in | 10 +++++----- benchmarks/bonnie++/files/patch-duration.cpp | 12 ++++++------ benchmarks/bonnie++/files/patch-getc_putc.cpp | 8 ++++---- benchmarks/bonnie++/files/patch-getc_putc_helper.cpp | 6 +++--- benchmarks/bonnie++/files/patch-port.h.in | 4 ++-- benchmarks/bonnie++/files/patch-rand.h | 4 ++-- 8 files changed, 28 insertions(+), 27 deletions(-) diff --git a/benchmarks/bonnie++/Makefile b/benchmarks/bonnie++/Makefile index 4c6918a50398..9ff61fd57a4b 100644 --- a/benchmarks/bonnie++/Makefile +++ b/benchmarks/bonnie++/Makefile @@ -10,6 +10,7 @@ WWW= https://www.coker.com.au/bonnie++/ LICENSE= GPLv2 USES= shebangfix tar:tgz +USE_CXXSTD= c++14 GNU_CONFIGURE= yes SHEBANG_FILES= bon_csv2txt.in diff --git a/benchmarks/bonnie++/files/patch-bonnie++.cpp b/benchmarks/bonnie++/files/patch-bonnie++.cpp index 12e01be32bfb..556dbb273624 100644 --- a/benchmarks/bonnie++/files/patch-bonnie++.cpp +++ b/benchmarks/bonnie++/files/patch-bonnie++.cpp @@ -1,6 +1,6 @@ ---- bonnie++.cpp.orig 2019-09-02 18:10:39.852145000 +0200 -+++ bonnie++.cpp 2019-09-02 18:12:18.027222000 +0200 -@@ -298,11 +298,7 @@ +--- bonnie++.cpp.orig 2018-09-16 01:13:24 UTC ++++ bonnie++.cpp +@@ -298,11 +298,7 @@ int main(int argc, char *argv[]) { char *sbuf = _strdup(optarg); char *size = strtok(sbuf, ":"); @@ -12,7 +12,7 @@ char * chunk_size = strtok(NULL, ":"); if(chunk_size) { -@@ -398,15 +394,6 @@ +@@ -398,15 +394,6 @@ int main(int argc, char *argv[]) if(file_size % 1024 > 512) file_size = file_size + 1024 - (file_size % 1024); } @@ -28,7 +28,7 @@ globals.byte_io_size = min(file_size, globals.byte_io_size); globals.byte_io_size = max(0, globals.byte_io_size); -@@ -479,14 +466,6 @@ +@@ -479,14 +466,6 @@ int main(int argc, char *argv[]) && (directory_max_size < directory_min_size || directory_max_size < 0 || directory_min_size < 0) ) usage(); diff --git a/benchmarks/bonnie++/files/patch-bonnie.h.in b/benchmarks/bonnie++/files/patch-bonnie.h.in index d6b9d5e1759e..0f3baa575613 100644 --- a/benchmarks/bonnie++/files/patch-bonnie.h.in +++ b/benchmarks/bonnie++/files/patch-bonnie.h.in @@ -1,4 +1,4 @@ ---- bonnie.h.in.orig 2009-07-03 03:39:33 UTC +--- bonnie.h.in.orig 2018-09-13 13:07:36 UTC +++ bonnie.h.in @@ -1,8 +1,6 @@ #ifndef BONNIE @@ -9,12 +9,12 @@ #define BON_VERSION "@version@" #define CSV_VERSION "@csv_version@" -@@ -12,6 +10,8 @@ using namespace std; +@@ -11,6 +9,8 @@ using namespace std; + #include #include #include - -+using namespace std; + ++using namespace std; + typedef FILE *PFILE; - #define SemKey 4711 diff --git a/benchmarks/bonnie++/files/patch-duration.cpp b/benchmarks/bonnie++/files/patch-duration.cpp index 3368eb7060de..165556362f6e 100644 --- a/benchmarks/bonnie++/files/patch-duration.cpp +++ b/benchmarks/bonnie++/files/patch-duration.cpp @@ -1,17 +1,17 @@ ---- duration.cpp.orig 2016-06-30 09:41:58.000000000 +0000 -+++ duration.cpp 2016-10-18 20:09:09.173611133 +0000 +--- duration.cpp.orig 2016-06-30 09:41:58 UTC ++++ duration.cpp @@ -1,5 +1,3 @@ -using namespace std; - #include #include "duration.h" -@@ -20,6 +18,8 @@ +@@ -19,6 +17,8 @@ using namespace std; + #include #endif #endif - -+using namespace std; + ++using namespace std; + Duration_Base::Duration_Base() : m_start(0.0) - , m_max(0.0) diff --git a/benchmarks/bonnie++/files/patch-getc_putc.cpp b/benchmarks/bonnie++/files/patch-getc_putc.cpp index 3ff9c2956453..0a501cba3251 100644 --- a/benchmarks/bonnie++/files/patch-getc_putc.cpp +++ b/benchmarks/bonnie++/files/patch-getc_putc.cpp @@ -1,6 +1,6 @@ ---- getc_putc.cpp.orig 2018-09-15 09:00:31.000000000 +0200 -+++ getc_putc.cpp 2019-09-05 12:09:25.705704000 +0200 -@@ -206,7 +206,7 @@ +--- getc_putc.cpp.orig 2018-09-15 07:00:31 UTC ++++ getc_putc.cpp +@@ -206,7 +206,7 @@ int main(int argc, char *argv[]) return 1; } fflush(NULL); @@ -9,7 +9,7 @@ if(fseek(fp, 0, SEEK_SET) != 0) { fprintf(stderr, "Can't seek.\n"); -@@ -221,7 +221,7 @@ +@@ -221,7 +221,7 @@ int main(int argc, char *argv[]) return 1; } fflush(NULL); diff --git a/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp b/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp index a7edca3b1b6c..bdd0c4ddc218 100644 --- a/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp +++ b/benchmarks/bonnie++/files/patch-getc_putc_helper.cpp @@ -1,6 +1,6 @@ ---- getc_putc_helper.cpp.orig 2009-07-03 04:26:05.000000000 +0200 -+++ getc_putc_helper.cpp 2019-09-05 12:09:25.707876000 +0200 -@@ -45,7 +45,7 @@ +--- getc_putc_helper.cpp.orig 2009-07-03 02:26:05 UTC ++++ getc_putc_helper.cpp +@@ -45,7 +45,7 @@ int main(int argc, char *argv[]) return 1; } fflush(NULL); diff --git a/benchmarks/bonnie++/files/patch-port.h.in b/benchmarks/bonnie++/files/patch-port.h.in index 6c6566bdec7a..3635d9f9bf48 100644 --- a/benchmarks/bonnie++/files/patch-port.h.in +++ b/benchmarks/bonnie++/files/patch-port.h.in @@ -1,5 +1,5 @@ ---- port.h.in.orig 2016-10-18 19:58:02.629657140 +0000 -+++ port.h.in 2016-10-18 20:02:26.501248353 +0000 +--- port.h.in.orig 2016-06-30 09:40:52 UTC ++++ port.h.in @@ -6,14 +6,7 @@ @semun@ @bool@ diff --git a/benchmarks/bonnie++/files/patch-rand.h b/benchmarks/bonnie++/files/patch-rand.h index 24ee7dc54583..70721dbb2e64 100644 --- a/benchmarks/bonnie++/files/patch-rand.h +++ b/benchmarks/bonnie++/files/patch-rand.h @@ -1,5 +1,5 @@ ---- rand.h.orig 2016-06-30 09:38:55.000000000 +0000 -+++ rand.h 2016-10-18 20:04:31.159630423 +0000 +--- rand.h.orig 2016-06-30 09:38:55 UTC ++++ rand.h @@ -1,11 +1,11 @@ #ifndef RAND_H #define RAND_H