netperf/netperf.patch@4ecfc2416fd8 (annotated)
netperf/netperf.patch
Tue, 29 Mar 2011 19:46:35 +0200
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Tue, 29 Mar 2011 19:46:35 +0200
- changeset 333
- 4ecfc2416fd8
- child 584
- 3d058537a9dd
- permissions
- -rw-r--r--
Correct and introduce slightly needed logic, leading to better reliability:
Update bash(1) patch logic, correct several buildconf make location
errors, correct failed bash(1) configure invocation, enable perl(1) to
build with unpathed make(1), patch rpm(1) to correctly link with
internal libdb(3), and lastly unsuscessfully try to reorganize rpm patch
hunks.
| michael@312 | 1 | diff -Nau configure.orig configure |
| michael@312 | 2 | Index: configure |
| michael@312 | 3 | --- configure.orig 2011-03-21 09:30:50.934813866 +0100 |
| michael@312 | 4 | +++ configure 2011-03-21 09:31:27.459048318 +0100 |
| michael@312 | 5 | @@ -8748,6 +8748,7 @@ |
| michael@312 | 6 | cat confdefs.h >>conftest.$ac_ext |
| michael@312 | 7 | cat >>conftest.$ac_ext <<_ACEOF |
| michael@312 | 8 | /* end confdefs.h. */ |
| michael@312 | 9 | +#include <sys/socket.h> |
| michael@312 | 10 | #include <netinet/sctp.h> |
| michael@312 | 11 | |
| michael@312 | 12 | int |
| michael@312 | 13 | diff -Nau src/net_uuid.c.orig src/net_uuid.c |
| michael@312 | 14 | Index: src/net_uuid.c |
| michael@312 | 15 | --- src/net_uuid.c.orig 2008-10-25 01:13:44.000000000 +0200 |
| michael@312 | 16 | +++ src/net_uuid.c 2011-03-21 14:23:16.000000000 +0100 |
| michael@312 | 17 | @@ -38,8 +38,10 @@ |
| michael@312 | 18 | #else |
| michael@312 | 19 | #include <sys/types.h> |
| michael@312 | 20 | #include <sys/time.h> |
| michael@312 | 21 | +#if !defined(__APPLE__) && !defined(__MACH__) |
| michael@312 | 22 | #include <sys/sysinfo.h> |
| michael@312 | 23 | #endif |
| michael@312 | 24 | +#endif |
| michael@312 | 25 | |
| michael@312 | 26 | /* system dependent call to get the current system time. Returned as |
| michael@312 | 27 | 100ns ticks since UUID epoch, but resolution may be less than |
| michael@312 | 28 | diff -Nau src/nettest_bsd.c.orig src/nettest_bsd.c |
| michael@312 | 29 | Index: src/nettest_bsd.c |
| michael@312 | 30 | --- src/nettest_bsd.c.orig 2011-03-21 09:20:13.471888999 +0100 |
| michael@312 | 31 | +++ src/nettest_bsd.c 2011-03-21 09:20:16.343927098 +0100 |
| michael@312 | 32 | @@ -97,6 +97,7 @@ |
| michael@312 | 33 | #endif /* NOSTDLIBH */ |
| michael@312 | 34 | |
| michael@312 | 35 | #ifdef WANT_SCTP |
| michael@312 | 36 | +#include <sys/socket.h> |
| michael@312 | 37 | #include <netinet/sctp.h> |
| michael@312 | 38 | #endif |
| michael@312 | 39 | |
| michael@312 | 40 | diff -Nau src/nettest_sctp.c.orig src/nettest_sctp.c |
| michael@312 | 41 | Index: src/nettest_sctp.c |
| michael@312 | 42 | --- src/nettest_sctp.c.orig 2011-03-21 09:22:57.248890123 +0100 |
| michael@312 | 43 | +++ src/nettest_sctp.c 2011-03-21 09:23:02.907197031 +0100 |
| michael@312 | 44 | @@ -58,6 +58,7 @@ |
| michael@312 | 45 | #include <netinet/sctp.h> |
| michael@312 | 46 | #include <arpa/inet.h> |
| michael@312 | 47 | #include <netdb.h> |
| michael@312 | 48 | +#include <strings.h> |
| michael@312 | 49 | |
| michael@312 | 50 | /* would seem that not all sctp.h files define a MSG_EOF, but that |
| michael@312 | 51 | MSG_EOF can be the same as MSG_FIN so lets work with that |
