Signed-off-by: Khem Raj <[email protected]> --- ...emove-duplicate-variable-definitions.patch | 37 +++++++++++++++++++ .../recipes-support/netperf/netperf_git.bb | 1 + 2 files changed, 38 insertions(+) create mode 100644 meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch
diff --git a/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch b/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch new file mode 100644 index 0000000000..08376417ba --- /dev/null +++ b/meta-networking/recipes-support/netperf/files/0001-nettest_omni-Remove-duplicate-variable-definitions.patch @@ -0,0 +1,37 @@ +From 6dd5b2b1f3ae3479647e2ef66e390d031066defe Mon Sep 17 00:00:00 2001 +From: Khem Raj <[email protected]> +Date: Wed, 12 Aug 2020 09:57:23 -0700 +Subject: [PATCH] nettest_omni: Remove duplicate variable definitions + +These defines are already defined in nettest_bsd.c and exported by +nettest_bsd.h this should fix build with -fno-common + +Upstream-Status: Submitted [https://github.com/HewlettPackard/netperf/pull/46] + +Signed-off-by: Khem Raj <[email protected]> +--- + 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 + diff --git a/meta-networking/recipes-support/netperf/netperf_git.bb b/meta-networking/recipes-support/netperf/netperf_git.bb index d48f3aeabd..a084fb4c15 100644 --- a/meta-networking/recipes-support/netperf/netperf_git.bb +++ b/meta-networking/recipes-support/netperf/netperf_git.bb @@ -13,6 +13,7 @@ SRC_URI = "git://github.com/HewlettPackard/netperf.git \ file://vfork.patch \ file://init \ file://0001-netlib.c-Move-including-sched.h-out-og-function.patch \ + file://0001-nettest_omni-Remove-duplicate-variable-definitions.patch \ " SRCREV = "f482bab49fcedee46fc5b755da127f608325cd13" -- 2.28.0
-=-=-=-=-=-=-=-=-=-=-=- Links: You receive all messages sent to this group. View/Reply Online (#86289): https://lists.openembedded.org/g/openembedded-devel/message/86289 Mute This Topic: https://lists.openembedded.org/mt/76155360/21656 Group Owner: [email protected] Unsubscribe: https://lists.openembedded.org/g/openembedded-devel/unsub [[email protected]] -=-=-=-=-=-=-=-=-=-=-=-
