Gentoo Archives: gentoo-commits

From: Andrew Savchenko <bircoph@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/bonnie++/files/
Date: Wed, 27 Jan 2016 11:14:57
Message-Id: 1453893280.f8dc1e9071fefd7502be1797d0c8e1fdbd9c2bc1.bircoph@gentoo
1 commit: f8dc1e9071fefd7502be1797d0c8e1fdbd9c2bc1
2 Author: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 27 11:13:08 2016 +0000
4 Commit: Andrew Savchenko <bircoph <AT> gentoo <DOT> org>
5 CommitDate: Wed Jan 27 11:14:40 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f8dc1e90
7
8 app-benchmarks/bonnie++: drop unused patches
9
10 Package-Manager: portage-2.2.27
11 Signed-off-by: Andrew Savchenko <bircoph <AT> gentoo.org>
12
13 .../bonnie++/files/bonnie++-1.93c-64bit.patch | 15 -------
14 .../files/bonnie++-1.93c-missing_include.patch | 46 ----------------------
15 .../files/bonnie++-1.94-missing_include.patch | 46 ----------------------
16 .../bonnie++/files/bonnie++-1.95-homepage.patch | 12 ------
17 4 files changed, 119 deletions(-)
18
19 diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.93c-64bit.patch b/app-benchmarks/bonnie++/files/bonnie++-1.93c-64bit.patch
20 deleted file mode 100644
21 index 2af76d8..0000000
22 --- a/app-benchmarks/bonnie++/files/bonnie++-1.93c-64bit.patch
23 +++ /dev/null
24 @@ -1,15 +0,0 @@
25 ---- getc_putc.cpp.old 2004-09-15 02:37:21.500489552 +0200
26 -+++ getc_putc.cpp 2004-09-15 02:40:58.623481840 +0200
27 -@@ -165,7 +165,11 @@
28 - int size = 0, wrote;
29 - while(size < file_size)
30 - {
31 -- wrote = write(FILE_FD, buf, min(sizeof(buf), (unsigned int)file_size - size));
32 -+ //wrote = write(FILE_FD, buf, min(sizeof(buf), (unsigned int)file_size - size));
33 -+ /*
34 -+ * gcc doesn't like above line. ? : should do the job as good as min()...
35 -+ */
36 -+ wrote = write(FILE_FD, buf, (sizeof(buf) < (file_size - size) ? (sizeof(buf)):(file_size - size)));
37 - if(wrote < 0)
38 - {
39 - fprintf(stderr, "Can't extend file - disk full?\n");
40
41 diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.93c-missing_include.patch b/app-benchmarks/bonnie++/files/bonnie++-1.93c-missing_include.patch
42 deleted file mode 100644
43 index 2afe02b..0000000
44 --- a/app-benchmarks/bonnie++/files/bonnie++-1.93c-missing_include.patch
45 +++ /dev/null
46 @@ -1,46 +0,0 @@
47 -diff -Naur bonnie++-1.93c.orig/bon_csv2html.cpp bonnie++-1.93c/bon_csv2html.cpp
48 ---- bonnie++-1.93c.orig/bon_csv2html.cpp 2008-05-02 14:12:19.000000000 +0200
49 -+++ bonnie++-1.93c/bon_csv2html.cpp 2008-05-02 14:13:57.000000000 +0200
50 -@@ -3,6 +3,7 @@
51 - #include <vector>
52 - #include <string.h>
53 - #include <math.h>
54 -+#include <stdlib.h>
55 -
56 - // Maximum number of items expected on a csv line
57 - #define MAX_ITEMS 48
58 -diff -Naur bonnie++-1.93c.orig/getc_putc.cpp bonnie++-1.93c/getc_putc.cpp
59 ---- bonnie++-1.93c.orig/getc_putc.cpp 2008-05-02 14:12:19.000000000 +0200
60 -+++ bonnie++-1.93c/getc_putc.cpp 2008-05-02 14:19:15.000000000 +0200
61 -@@ -12,6 +12,7 @@
62 - #include <sys/types.h>
63 - #include <sys/stat.h>
64 - #include <fcntl.h>
65 -+#include <string.h>
66 - #include <vector>
67 -
68 - #include "duration.h"
69 -diff -Naur bonnie++-1.93c.orig/getc_putc_helper.cpp bonnie++-1.93c/getc_putc_helper.cpp
70 ---- bonnie++-1.93c.orig/getc_putc_helper.cpp 2008-05-02 14:12:19.000000000 +0200
71 -+++ bonnie++-1.93c/getc_putc_helper.cpp 2008-05-02 14:19:57.000000000 +0200
72 -@@ -7,6 +7,7 @@
73 - #include <sys/types.h>
74 - #include <sys/stat.h>
75 - #include <fcntl.h>
76 -+#include <string.h>
77 - #include "duration.h"
78 - #include <vector>
79 - #include "getc_putc.h"
80 -diff -Naur bonnie++-1.93c.orig/zcav.cpp bonnie++-1.93c/zcav.cpp
81 ---- bonnie++-1.93c.orig/zcav.cpp 2008-05-02 14:12:19.000000000 +0200
82 -+++ bonnie++-1.93c/zcav.cpp 2008-05-02 14:20:42.000000000 +0200
83 -@@ -9,6 +9,9 @@
84 - #include "getopt.h"
85 - #endif
86 -
87 -+#include <stdlib.h>
88 -+#include <string.h>
89 -+
90 - #define TOO_MANY_LOOPS 100
91 -
92 - void usage()
93
94 diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.94-missing_include.patch b/app-benchmarks/bonnie++/files/bonnie++-1.94-missing_include.patch
95 deleted file mode 100644
96 index 2afe02b..0000000
97 --- a/app-benchmarks/bonnie++/files/bonnie++-1.94-missing_include.patch
98 +++ /dev/null
99 @@ -1,46 +0,0 @@
100 -diff -Naur bonnie++-1.93c.orig/bon_csv2html.cpp bonnie++-1.93c/bon_csv2html.cpp
101 ---- bonnie++-1.93c.orig/bon_csv2html.cpp 2008-05-02 14:12:19.000000000 +0200
102 -+++ bonnie++-1.93c/bon_csv2html.cpp 2008-05-02 14:13:57.000000000 +0200
103 -@@ -3,6 +3,7 @@
104 - #include <vector>
105 - #include <string.h>
106 - #include <math.h>
107 -+#include <stdlib.h>
108 -
109 - // Maximum number of items expected on a csv line
110 - #define MAX_ITEMS 48
111 -diff -Naur bonnie++-1.93c.orig/getc_putc.cpp bonnie++-1.93c/getc_putc.cpp
112 ---- bonnie++-1.93c.orig/getc_putc.cpp 2008-05-02 14:12:19.000000000 +0200
113 -+++ bonnie++-1.93c/getc_putc.cpp 2008-05-02 14:19:15.000000000 +0200
114 -@@ -12,6 +12,7 @@
115 - #include <sys/types.h>
116 - #include <sys/stat.h>
117 - #include <fcntl.h>
118 -+#include <string.h>
119 - #include <vector>
120 -
121 - #include "duration.h"
122 -diff -Naur bonnie++-1.93c.orig/getc_putc_helper.cpp bonnie++-1.93c/getc_putc_helper.cpp
123 ---- bonnie++-1.93c.orig/getc_putc_helper.cpp 2008-05-02 14:12:19.000000000 +0200
124 -+++ bonnie++-1.93c/getc_putc_helper.cpp 2008-05-02 14:19:57.000000000 +0200
125 -@@ -7,6 +7,7 @@
126 - #include <sys/types.h>
127 - #include <sys/stat.h>
128 - #include <fcntl.h>
129 -+#include <string.h>
130 - #include "duration.h"
131 - #include <vector>
132 - #include "getc_putc.h"
133 -diff -Naur bonnie++-1.93c.orig/zcav.cpp bonnie++-1.93c/zcav.cpp
134 ---- bonnie++-1.93c.orig/zcav.cpp 2008-05-02 14:12:19.000000000 +0200
135 -+++ bonnie++-1.93c/zcav.cpp 2008-05-02 14:20:42.000000000 +0200
136 -@@ -9,6 +9,9 @@
137 - #include "getopt.h"
138 - #endif
139 -
140 -+#include <stdlib.h>
141 -+#include <string.h>
142 -+
143 - #define TOO_MANY_LOOPS 100
144 -
145 - void usage()
146
147 diff --git a/app-benchmarks/bonnie++/files/bonnie++-1.95-homepage.patch b/app-benchmarks/bonnie++/files/bonnie++-1.95-homepage.patch
148 deleted file mode 100644
149 index 114d414..0000000
150 --- a/app-benchmarks/bonnie++/files/bonnie++-1.95-homepage.patch
151 +++ /dev/null
152 @@ -1,12 +0,0 @@
153 -diff -Nu -Nu -uarN bonnie++-1.93c.orig/bonnie++.8 bonnie++-1.93c/bonnie++.8
154 ---- bonnie++-1.93c.orig/bonnie++.8 2008-05-27 09:49:18.000000000 +0200
155 -+++ bonnie++-1.93c/bonnie++.8 2008-05-27 09:51:50.000000000 +0200
156 -@@ -32,7 +32,7 @@
157 - INN.
158 - .P
159 - All the details of the tests performed by Bonnie++ are contained in the file
160 --.BR /usr/share/doc/bonnie++/readme.html
161 -+.BR /usr/share/doc/bonnie++-1.95/html/readme.html
162 -
163 - .SH "OPTIONS"
164 - For Bonnie++ every option is of the form of a hyphen followed by a letter and