Skip to contentSkip to conversation

package/netperf: fix build with gcc 10

PATCH New Fabrice Fontaine 3 participants 3 messages Sep 5, 2020 – Sep 9, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 package/netperf: fix build with gcc 10

Fixes:
- http://autobuild.buildroot.org/results/547d9a803375cce93b8e3e7a59243190b71c7688

---
 ...st_omni.c-fix-compilation-with-GCC10.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch
package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch new file +42 -0
new file mode 100644
index 0000000000..261dfe9a0e
@@ -0,0 +1,42 @@
+From b2fd0f324002d0cf52ae905b2a469bf1067f182a Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sat, 5 Sep 2020 14:30:20 +0200
+Subject: [PATCH] src/nettest_omni.c: fix compilation with GCC10
+
+GCC10 defaults to -fno-common, which breaks compilation when there are
+multiple definitions of implicit "extern" variables. Remove the extra
+definitions.
+
+Fix #42
+
+Signed-off-by: Tony Ambardar <[email protected]>
+[Retrieved from:
+https://github.com/openwrt/packages/blob/master/net/netperf/patches/010-gcc10_multiple_definition_fix.patch]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/HewlettPackard/netperf/pull/48]
+---
+ src/nettest_omni.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/nettest_omni.c b/src/nettest_omni.c
+index 852eeb1..862088a 100644
+--- a/src/nettest_omni.c
++++ b/src/nettest_omni.c
+@@ -458,14 +458,6 @@ static int client_port_max = 65535;
+ 
+  /* different options for the sockets				*/
+ 
+-int
+-  loc_nodelay,		/* don't/do use NODELAY	locally		*/
+-  rem_nodelay,		/* don't/do use NODELAY remotely	*/
+-  loc_sndavoid,		/* avoid send copies locally		*/
+-  loc_rcvavoid,		/* avoid recv copies locally		*/
+-  rem_sndavoid,		/* avoid send copies remotely		*/
+-  rem_rcvavoid; 	/* avoid recv_copies remotely		*/
+-
+ extern int
+   loc_tcpcork,
+   rem_tcpcork,
+-- 
+2.28.0
+
Signature · 1 line
2.28.0
#1 lore raw

PATCH 1/1 package/netperf: fix build with gcc 10

Fabrice, All,

On 2020-09-05 14:35 +0200, Fabrice Fontaine spake thusly:

Quoted 4 lines

Fixes:
- http://autobuild.buildroot.org/results/547d9a803375cce93b8e3e7a59243190b71c7688

Applied to master, thanks.

Regards,
Yann E. MORIN.

Quoted 60 lines
---
 ...st_omni.c-fix-compilation-with-GCC10.patch | 42 +++++++++++++++++++
 1 file changed, 42 insertions(+)
 create mode 100644 package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch
package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch new file +42 -0
new file mode 100644
index 0000000000..261dfe9a0e
@@ -0,0 +1,42 @@
+From b2fd0f324002d0cf52ae905b2a469bf1067f182a Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <[email protected]>
+Date: Sat, 5 Sep 2020 14:30:20 +0200
+Subject: [PATCH] src/nettest_omni.c: fix compilation with GCC10
+
+GCC10 defaults to -fno-common, which breaks compilation when there are
+multiple definitions of implicit "extern" variables. Remove the extra
+definitions.
+
+Fix #42
+
+Signed-off-by: Tony Ambardar <[email protected]>
+[Retrieved from:
+https://github.com/openwrt/packages/blob/master/net/netperf/patches/010-gcc10_multiple_definition_fix.patch]
+Signed-off-by: Fabrice Fontaine <[email protected]>
+[Upstream status: https://github.com/HewlettPackard/netperf/pull/48]
+---
+ src/nettest_omni.c | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/src/nettest_omni.c b/src/nettest_omni.c
+index 852eeb1..862088a 100644
+--- a/src/nettest_omni.c
++++ b/src/nettest_omni.c
+@@ -458,14 +458,6 @@ static int client_port_max = 65535;
+ 
+  /* different options for the sockets				*/
+ 
+-int
+-  loc_nodelay,		/* don't/do use NODELAY	locally		*/
+-  rem_nodelay,		/* don't/do use NODELAY remotely	*/
+-  loc_sndavoid,		/* avoid send copies locally		*/
+-  loc_rcvavoid,		/* avoid recv copies locally		*/
+-  rem_sndavoid,		/* avoid send copies remotely		*/
+-  rem_rcvavoid; 	/* avoid recv_copies remotely		*/
+-
+ extern int
+   loc_tcpcork,
+   rem_tcpcork,
+-- 
+2.28.0
+
Signature · 6 lines
2.28.0

_______________________________________________
buildroot mailing list
buildroot at busybox.net
http://lists.busybox.net/mailman/listinfo/buildroot
Signature · 6 lines
.-----------------.--------------------.------------------.--------------------.
|  Yann E. MORIN  | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software  Designer | \ / CAMPAIGN     |  ___               |
| +33 561 099 427 `------------.-------:  X  AGAINST      |  \e/  There is no  |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL    |   v   conspiracy.  |
'------------------------------^-------^------------------^--------------------'