diff mbox series

[1/1] package/iperf: fix build without threads

Message ID 20221026203941.555393-1-fontaine.fabrice@gmail.com
State Accepted
Headers show
Series [1/1] package/iperf: fix build without threads | expand

Commit Message

Fabrice Fontaine Oct. 26, 2022, 8:39 p.m. UTC
Fix the following build failure without threads raised since bump to
version 2.1.8 in commit ede944f53509f825aa983de19d34fc30259b812c:

Settings.cpp: In function 'void Settings_Interpret(char, const char*, thread_Settings*)':
Settings.cpp:1281:9: error: break statement not within loop or switch
 1281 |         break;
      |         ^~~~~

Fixes:
 - http://autobuild.buildroot.org/results/2bcddf8439f6913fdf19b1fc2d33999a787ab3b2

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
 ...fix-single-threaded-compile-breakage.patch | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 package/iperf/0001-fix-single-threaded-compile-breakage.patch

Comments

Thomas Petazzoni Oct. 27, 2022, 6:50 a.m. UTC | #1
On Wed, 26 Oct 2022 22:39:41 +0200
Fabrice Fontaine <fontaine.fabrice@gmail.com> wrote:

> Fix the following build failure without threads raised since bump to
> version 2.1.8 in commit ede944f53509f825aa983de19d34fc30259b812c:
> 
> Settings.cpp: In function 'void Settings_Interpret(char, const char*, thread_Settings*)':
> Settings.cpp:1281:9: error: break statement not within loop or switch
>  1281 |         break;
>       |         ^~~~~
> 
> Fixes:
>  - http://autobuild.buildroot.org/results/2bcddf8439f6913fdf19b1fc2d33999a787ab3b2
> 
> Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
> ---
>  ...fix-single-threaded-compile-breakage.patch | 32 +++++++++++++++++++
>  1 file changed, 32 insertions(+)
>  create mode 100644 package/iperf/0001-fix-single-threaded-compile-breakage.patch

Applied to master, thanks.

Thomas
diff mbox series

Patch

diff --git a/package/iperf/0001-fix-single-threaded-compile-breakage.patch b/package/iperf/0001-fix-single-threaded-compile-breakage.patch
new file mode 100644
index 0000000000..85baf76ea4
--- /dev/null
+++ b/package/iperf/0001-fix-single-threaded-compile-breakage.patch
@@ -0,0 +1,32 @@ 
+From 6405b7a005bb2364466b56f480d50af0be423d76 Mon Sep 17 00:00:00 2001
+From: Robert McMahon <rjmcmahon@rjmcmahon.com>
+Date: Tue, 27 Sep 2022 20:31:04 -0700
+Subject: [PATCH] fix single threaded compile breakage
+
+[Retrieved (and backported) from:
+https://sourceforge.net/p/iperf2/code/ci/6405b7a005bb2364466b56f480d50af0be423d76]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+---
+ include/version.h | 2 +-
+ src/Settings.cpp  | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/Settings.cpp b/src/Settings.cpp
+index aac1b5f..fc5a181 100644
+--- a/src/Settings.cpp
++++ b/src/Settings.cpp
+@@ -1160,10 +1160,10 @@ void Settings_Interpret (char option, const char *optarg, struct thread_Settings
+ 			delete [] tmp;
+ 		    }
+ 		}
++	    }
+ #else
+ 		fprintf(stderr, "bounceback-congest option requires a platform that supports threads\n");
+ #endif
+-	    }
+ 	}
+ 	if (bouncebackdelaystart) {
+ 	    bouncebackdelaystart = 0;
+-- 
+2.35.1
+