coreos-overlay/netperf: Sync with Gentoo

Signed-off-by: Jeremi Piotrowski <jpiotrowski@microsoft.com>
This commit is contained in:
Jeremi Piotrowski 2024-05-31 12:01:01 +02:00
parent 125fd920dc
commit d179345cce
2 changed files with 42 additions and 9 deletions

View File

@ -0,0 +1,30 @@
https://github.com/HewlettPackard/netperf/pull/46
https://bugs.gentoo.org/706694
From c6a2e17fe35f0e68823451fedfdf5b1dbecddbe3 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
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
Signed-off-by: Khem Raj <raj.khem@gmail.com>
--- 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,

View File

@ -1,24 +1,27 @@
# Copyright 1999-2021 Gentoo Authors
# Copyright 1999-2023 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
EAPI=8
inherit flag-o-matic
DESCRIPTION="Network performance benchmark"
SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 sparc x86"
HOMEPAGE="http://www.netperf.org/"
SRC_URI="ftp://ftp.netperf.org/${PN}/${P}.tar.bz2"
LICENSE="netperf"
SLOT="0"
KEYWORDS="~alpha amd64 arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86"
IUSE="demo sctp"
DEPEND="
RDEPEND="
acct-group/netperf
acct-user/netperf
"
RDEPEND="${DEPEND}"
BDEPEND="
${RDEPEND}
sys-devel/gnuconfig
"
PATCHES=(
"${FILESDIR}"/${PN}-fix-scripts.patch
@ -26,6 +29,7 @@ PATCHES=(
"${FILESDIR}"/${PN}-2.7.0-includes.patch
"${FILESDIR}"/${PN}-2.7.0-space.patch
"${FILESDIR}"/${PN}-2.7.0-inline.patch
"${FILESDIR}"/${PN}-2.7.0-fcommon.patch
)
src_prepare() {
@ -44,10 +48,9 @@ src_prepare() {
}
src_configure() {
append-cflags -fcommon
# netlib.c:2292:5: warning: implicit declaration of function sched_setaffinity
# nettest_omni.c:2943:5: warning: implicit declaration of function splice
# TODO: drop once https://github.com/HewlettPackard/netperf/pull/73 merged
append-cppflags -D_GNU_SOURCE
econf \