From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH 1/1] package/netperf: fix build with gcc 10
Date: Sat, 5 Sep 2020 14:35:18 +0200 [thread overview]
Message-ID: <20200905123518.530182-1-fontaine.fabrice@gmail.com> (raw)
Fixes:
- http://autobuild.buildroot.org/results/547d9a803375cce93b8e3e7a59243190b71c7688
Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
---
...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
diff --git a/package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch b/package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch
new file mode 100644
index 0000000000..261dfe9a0e
--- /dev/null
+++ b/package/netperf/0001-src-nettest_omni.c-fix-compilation-with-GCC10.patch
@@ -0,0 +1,42 @@
+From b2fd0f324002d0cf52ae905b2a469bf1067f182a Mon Sep 17 00:00:00 2001
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+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 <itugrok@yahoo.com>
+[Retrieved from:
+https://github.com/openwrt/packages/blob/master/net/netperf/patches/010-gcc10_multiple_definition_fix.patch]
+Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+[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
+
--
2.28.0
next reply other threads:[~2020-09-05 12:35 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-09-05 12:35 Fabrice Fontaine [this message]
2020-09-06 7:41 ` [Buildroot] [PATCH 1/1] package/netperf: fix build with gcc 10 Yann E. MORIN
2020-09-09 20:38 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200905123518.530182-1-fontaine.fabrice@gmail.com \
--to=fontaine.fabrice@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox