summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2010-06-02 19:02:45 (GMT)
committer Peter Korsgaard <jacmet@sunsite.dk>2010-06-02 19:02:45 (GMT)
commit3c5deb98def6a7d9400c5c36dea5dead128b1b40 (patch)
tree860e3918711a68daa24b9f33a2c6ccab4066b628
parent3d5198c19bd9f10618448890e50f2ef953e91e86 (diff)
downloadbuildroot-3c5deb98def6a7d9400c5c36dea5dead128b1b40.tar.gz
buildroot-3c5deb98def6a7d9400c5c36dea5dead128b1b40.tar.bz2
netperf: fix build with uClibc 0.9.31
Closes #1909 Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--CHANGES8
-rw-r--r--package/netperf/netperf-2.4.5-dccp.patch38
2 files changed, 46 insertions, 0 deletions
diff --git a/CHANGES b/CHANGES
index f635864..dffc848 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,13 @@
2010.08, Not released yet:
+ Fixes all over the tree.
+
+ Updated/fixed packages: netperf
+
+ Issues resolved (http://bugs.uclibc.org):
+
+ #1909: netperf-2.4.5 fails to build because of undeclared SOCK_DCCP
+
2010.05, Released May 30th, 2010:
Fixes all over the tree.
diff --git a/package/netperf/netperf-2.4.5-dccp.patch b/package/netperf/netperf-2.4.5-dccp.patch
new file mode 100644
index 0000000..ae84cee
--- /dev/null
+++ b/package/netperf/netperf-2.4.5-dccp.patch
@@ -0,0 +1,38 @@
+[PATCH] fix build on systems where IPROTO_DCCP is defined, but SOCK_DCCP isn't
+
+On some systems (E.G. uClibc 0.9.31) IPROTO_DCCP is defined, but SOCK_DCCP
+isn't - Causing the build to break. Fix it by checking for both before
+using.
+
+Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
+---
+ src/netsh.c | 2 +-
+ src/nettest_bsd.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+Index: netperf-2.4.5/src/netsh.c
+===================================================================
+--- netperf-2.4.5.orig/src/netsh.c
++++ netperf-2.4.5/src/netsh.c
+@@ -452,7 +452,7 @@ parse_protocol(char protocol_string[])
+ return IPPROTO_SDP;
+ }
+ #endif
+-#ifdef IPPROTO_DCCP
++#if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
+ if (!strcasecmp(temp,"dccp")) {
+ socket_type = SOCK_DCCP;
+ return IPPROTO_DCCP;
+Index: netperf-2.4.5/src/nettest_bsd.c
+===================================================================
+--- netperf-2.4.5.orig/src/nettest_bsd.c
++++ netperf-2.4.5/src/nettest_bsd.c
+@@ -712,7 +712,7 @@ complete_addrinfo(char *controlhost, cha
+ that we did this so the code for the Solaris kludge can do
+ the fix-up for us. also flip error over to EAI_AGAIN and
+ make sure we don't "count" this time around the loop. */
+-#if defined(IPPROTO_DCCP)
++#if defined(IPPROTO_DCCP) && defined(SOCK_DCCP)
+ /* only tweak on this one the second time around, after we've
+ kludged the ai_protocol field */
+ if ((hints.ai_socktype == SOCK_DCCP) &&