Skip to content

Commit fb2a2f3

Browse files
committed
update iperf2 patch
updating to iperf 2.0.9 introduces another problems of crash so, keep version as 2.0.5 should be easier to maintain. Signed-off-by: Hajime Tazaki <[email protected]>
1 parent 24c780a commit fb2a2f3

File tree

1 file changed

+25
-166
lines changed

1 file changed

+25
-166
lines changed

utils/iperf_4_dce.patch

Lines changed: 25 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -1,173 +1,32 @@
1-
diff -r e6a6b9c61d5c Makefile
2-
--- a/Makefile Tue Nov 20 10:38:26 2012 +0100
3-
+++ b/Makefile Tue Nov 20 10:41:10 2012 +0100
4-
@@ -83,12 +83,12 @@
5-
AWK = gawk
6-
CC = gcc
7-
CCDEPMODE = depmode=gcc3
8-
-CFLAGS = -O2
9-
+CFLAGS = -g -fpic
10-
CPP = gcc -E
11-
CPPFLAGS =
12-
CXX = g++
13-
CXXDEPMODE = depmode=gcc3
14-
-CXXFLAGS = -O2
15-
+CXXFLAGS = -g -fpic
16-
CYGPATH_W = echo
17-
DEFS = -DHAVE_CONFIG_H
18-
DEPDIR = .deps
19-
@@ -102,7 +102,7 @@
20-
INSTALL_PROGRAM = ${INSTALL}
21-
INSTALL_SCRIPT = ${INSTALL}
22-
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
23-
-LDFLAGS =
24-
+LDFLAGS = -pie
25-
LIBOBJS =
26-
LIBS =
27-
LTLIBOBJS =
28-
diff -r e6a6b9c61d5c compat/Makefile
29-
--- a/compat/Makefile Tue Nov 20 10:38:26 2012 +0100
30-
+++ b/compat/Makefile Tue Nov 20 10:41:10 2012 +0100
31-
@@ -84,12 +84,12 @@
32-
AWK = gawk
33-
CC = gcc
34-
CCDEPMODE = depmode=gcc3
35-
-CFLAGS = -O2
36-
+CFLAGS = -g -fpic
37-
CPP = gcc -E
38-
CPPFLAGS =
39-
CXX = g++
40-
CXXDEPMODE = depmode=gcc3
41-
-CXXFLAGS = -O2
42-
+CXXFLAGS = -g -fpic
43-
CYGPATH_W = echo
44-
DEFS = -DHAVE_CONFIG_H
45-
DEPDIR = .deps
46-
@@ -103,7 +103,7 @@
47-
INSTALL_PROGRAM = ${INSTALL}
48-
INSTALL_SCRIPT = ${INSTALL}
49-
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
50-
-LDFLAGS =
51-
+LDFLAGS = -pie
52-
LIBOBJS =
53-
LIBS =
54-
LTLIBOBJS =
55-
diff -r e6a6b9c61d5c compat/Thread.c
56-
--- a/compat/Thread.c Tue Nov 20 10:38:26 2012 +0100
57-
+++ b/compat/Thread.c Tue Nov 20 10:41:10 2012 +0100
58-
@@ -409,6 +409,7 @@
1+
diff --git a/compat/Thread.c b/compat/Thread.c
2+
index e0fe4f8951c0..e286f35e7d06 100644
3+
--- a/compat/Thread.c
4+
+++ b/compat/Thread.c
5+
@@ -409,6 +409,7 @@ void thread_rest ( void ) {
596
SwitchToThread( );
607
#endif
618
#endif
629
+ sleep (1);
6310
}
6411

6512
#ifdef __cplusplus
66-
diff -r e6a6b9c61d5c doc/Makefile
67-
--- a/doc/Makefile Tue Nov 20 10:38:26 2012 +0100
68-
+++ b/doc/Makefile Tue Nov 20 10:41:10 2012 +0100
69-
@@ -59,12 +59,12 @@
70-
AWK = gawk
71-
CC = gcc
72-
CCDEPMODE = depmode=gcc3
73-
-CFLAGS = -O2
74-
+CFLAGS = -g -fpic
75-
CPP = gcc -E
76-
CPPFLAGS =
77-
CXX = g++
78-
CXXDEPMODE = depmode=gcc3
79-
-CXXFLAGS = -O2
80-
+CXXFLAGS = -g -fpic
81-
CYGPATH_W = echo
82-
DEFS = -DHAVE_CONFIG_H
83-
DEPDIR = .deps
84-
@@ -78,7 +78,7 @@
85-
INSTALL_PROGRAM = ${INSTALL}
86-
INSTALL_SCRIPT = ${INSTALL}
87-
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
88-
-LDFLAGS =
89-
+LDFLAGS = -pie
90-
LIBOBJS =
91-
LIBS =
92-
LTLIBOBJS =
93-
diff -r e6a6b9c61d5c include/Makefile
94-
--- a/include/Makefile Tue Nov 20 10:38:26 2012 +0100
95-
+++ b/include/Makefile Tue Nov 20 10:41:10 2012 +0100
96-
@@ -59,12 +59,12 @@
97-
AWK = gawk
98-
CC = gcc
99-
CCDEPMODE = depmode=gcc3
100-
-CFLAGS = -O2
101-
+CFLAGS = -g -fpic
102-
CPP = gcc -E
103-
CPPFLAGS =
104-
CXX = g++
105-
CXXDEPMODE = depmode=gcc3
106-
-CXXFLAGS = -O2
107-
+CXXFLAGS = -g -fpic
108-
CYGPATH_W = echo
109-
DEFS = -DHAVE_CONFIG_H
110-
DEPDIR = .deps
111-
@@ -78,7 +78,7 @@
112-
INSTALL_PROGRAM = ${INSTALL}
113-
INSTALL_SCRIPT = ${INSTALL}
114-
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
115-
-LDFLAGS =
116-
+LDFLAGS = -pie
117-
LIBOBJS =
118-
LIBS =
119-
LTLIBOBJS =
120-
diff -r e6a6b9c61d5c man/Makefile
121-
--- a/man/Makefile Tue Nov 20 10:38:26 2012 +0100
122-
+++ b/man/Makefile Tue Nov 20 10:41:10 2012 +0100
123-
@@ -64,12 +64,12 @@
124-
AWK = gawk
125-
CC = gcc
126-
CCDEPMODE = depmode=gcc3
127-
-CFLAGS = -O2
128-
+CFLAGS = -g -fpic
129-
CPP = gcc -E
130-
CPPFLAGS =
131-
CXX = g++
132-
CXXDEPMODE = depmode=gcc3
133-
-CXXFLAGS = -O2
134-
+CXXFLAGS = -g -fpic
135-
CYGPATH_W = echo
136-
DEFS = -DHAVE_CONFIG_H
137-
DEPDIR = .deps
138-
@@ -83,7 +83,7 @@
139-
INSTALL_PROGRAM = ${INSTALL}
140-
INSTALL_SCRIPT = ${INSTALL}
141-
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
142-
-LDFLAGS =
143-
+LDFLAGS = -pie
144-
LIBOBJS =
145-
LIBS =
146-
LTLIBOBJS =
147-
diff -r e6a6b9c61d5c src/Makefile
148-
--- a/src/Makefile Tue Nov 20 10:38:26 2012 +0100
149-
+++ b/src/Makefile Tue Nov 20 10:41:10 2012 +0100
150-
@@ -88,12 +88,12 @@
151-
AWK = gawk
152-
CC = gcc
153-
CCDEPMODE = depmode=gcc3
154-
-CFLAGS = -O2
155-
+CFLAGS = -g -fpic
156-
CPP = gcc -E
157-
CPPFLAGS =
158-
CXX = g++
159-
CXXDEPMODE = depmode=gcc3
160-
-CXXFLAGS = -O2
161-
+CXXFLAGS = -g -fpic
162-
CYGPATH_W = echo
163-
DEFS = -DHAVE_CONFIG_H
164-
DEPDIR = .deps
165-
@@ -107,7 +107,7 @@
166-
INSTALL_PROGRAM = ${INSTALL}
167-
INSTALL_SCRIPT = ${INSTALL}
168-
INSTALL_STRIP_PROGRAM = ${SHELL} $(install_sh) -c -s
169-
-LDFLAGS =
170-
+LDFLAGS = -pie
171-
LIBOBJS =
172-
LIBS =
173-
LTLIBOBJS =
13+
diff --git a/include/headers.h b/include/headers.h
14+
index 4667bfe894ce..8d7d9a64874c 100644
15+
--- a/include/headers.h
16+
+++ b/include/headers.h
17+
@@ -57,6 +57,7 @@
18+
#define HEADERS_H
19+
20+
21+
+#include <math.h>
22+
#ifdef HAVE_CONFIG_H
23+
#include "config.h"
24+
25+
@@ -82,7 +83,6 @@
26+
#include <errno.h>
27+
#include <string.h>
28+
#include <time.h>
29+
-#include <math.h>
30+
31+
#ifdef WIN32
32+

0 commit comments

Comments
 (0)