Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update netperf to MIT licensed version #2015

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
DIST netperf-2.7.0_pre20210121.tar.gz 1914186 BLAKE2B 14d3a769a049443d8bf62b58c93c2b9563a16b69bb151d35926aa8831167b8a31bdd7d820c80a0c0511a78e519742005bdfa2079d403a514e2ec17f41a1b8e7c SHA512 8d9908fe2cd778eae719265b67938ab44e18de960c845f976e80d6b419c08b11ae47d8b4b906c6ccaf280f9f66bcdcb0be2ab379b0dca8d62d86671d57057e20
Original file line number Diff line number Diff line change
@@ -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,

Original file line number Diff line number Diff line change
@@ -1,33 +1,38 @@
# 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
inherit autotools 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="https://github.com/HewlettPackard/netperf"
EGIT_COMMIT="3bc455b23f901dae377ca0a558e1e32aa56b31c4"
SRC_URI="https://github.com/HewlettPackard/${PN}/archive/${EGIT_COMMIT}.tar.gz -> ${P}.tar.gz"

HOMEPAGE="http://www.netperf.org/"
LICENSE="netperf"

LICENSE="MIT"
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
"${FILESDIR}"/${PN}-2.6.0-log-dir.patch
"${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
)

S="${WORKDIR}/${PN}-${EGIT_COMMIT}"

src_prepare() {
# Fixing paths in scripts
sed -i \
Expand All @@ -41,13 +46,17 @@ src_prepare() {
|| die

default
# from autogen.sh
eaclocal -I src/missing/m4
eautomake
eautoconf
eautoheader
}

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 \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -60,13 +60,12 @@ USE="${USE} bindist"

# Additional licenses accepted for Flatcar builds.
#
# netperf - license for net-analyzer/netperf
# no-source-code - license for sys-kernel/coreos-firmware
# linux-fw-redistributable - license for sys-kernel/coreos-firmware
# freedist - license for sys-kernel/coreos-kernel
# BSD-2-Clause-Patent - license for sys-firmware/edk2-aarch64
# intel-ucode - license for sys-firmware/intel-microcode
ACCEPT_LICENSE="${ACCEPT_LICENSE} netperf no-source-code
ACCEPT_LICENSE="${ACCEPT_LICENSE} no-source-code
linux-fw-redistributable freedist BSD-2-Clause-Patent intel-ucode"

# Favor our own mirrors over Gentoo's
Expand Down
43 changes: 0 additions & 43 deletions sdk_container/src/third_party/portage-stable/licenses/netperf

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Loading