mirror of
https://github.com/flatcar/scripts.git
synced 2026-05-04 11:51:14 +02:00
net-misc/iperf: Sync with Gentoo
It's from Gentoo commit 666ec82c74b2d651e2d8fbf2ed4d96d97c6bb36e.
This commit is contained in:
parent
c26e830bf6
commit
08e1720c66
@ -1,3 +1,3 @@
|
||||
DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
|
||||
DIST iperf-3.12.tar.gz 648136 BLAKE2B 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae SHA512 9b0600a19750311557833b32ca5c4be809ab98643522f125645dd8f83c482017e42fbe5fc9484624731176a59b67203a468eb81eebf1a37b9c1b3eff818857ba
|
||||
DIST iperf-3.13.tar.gz 648754 BLAKE2B 8b08ae0e67ed066c7dabd115b757fefff03196aa2d732b6d88e20cf82ea3a5431b9be753fcc7b331932a5e59dc3e24ff4b929a7a1af5b500704cdd5094bf6859 SHA512 067147edffa1d7482a9fc5d54638091f8bc099b9c45d9a471f4e33730463548fb2350749620f2ca3ff509cd7a9c4f63bf01f84cab36718edd8784ce7a15ca368
|
||||
DIST iperf-3.14.tar.gz 650626 BLAKE2B 3809689964721ec2f58d29985c1767bc12473f9b659fd8bd430adb00558ceda2519276dbc0df5cb9634ef96d3d98708b8413a712cdb372bd34a28a330049349f SHA512 a90fbaddd73e5b721a84cee71cefb63391c13f64107f5785e954e7c44e9a8c5072e402b6fe45434966d3cc58ac97227c608ca9719161fc23459c5e5efcf8232b
|
||||
|
||||
@ -1,43 +0,0 @@
|
||||
https://github.com/esnet/iperf/pull/1398
|
||||
|
||||
From 3a03f775ca103f2e824abef903130280c57ca8ac Mon Sep 17 00:00:00 2001
|
||||
From: Sam James <sam@gentoo.org>
|
||||
Date: Sun, 2 Oct 2022 02:58:59 +0100
|
||||
Subject: [PATCH] config/iperf_config_static_bin.m4: fix bashism
|
||||
|
||||
configure scripts need to be runnable with a POSIX-compliant /bin/sh.
|
||||
|
||||
On many (but not all!) systems, /bin/sh is provided by Bash, so errors
|
||||
like this aren't spotted. Notably Debian defaults to /bin/sh provided
|
||||
by dash which doesn't tolerate such bashisms as '=='.
|
||||
|
||||
This retains compatibility with bash.
|
||||
|
||||
Fixes configure warnings/errors like:
|
||||
```
|
||||
./configure: 2670: test: x: unexpected operator
|
||||
```
|
||||
|
||||
Signed-off-by: Sam James <sam@gentoo.org>
|
||||
--- a/config/iperf_config_static_bin.m4
|
||||
+++ b/config/iperf_config_static_bin.m4
|
||||
@@ -7,6 +7,6 @@ AC_ARG_ENABLE([static-bin],
|
||||
[:])
|
||||
AM_CONDITIONAL([ENABLE_STATIC_BIN], [test x$enable_static_bin = xno])
|
||||
|
||||
-AS_IF([test "x$enable_static_bin" == xyes],
|
||||
+AS_IF([test "x$enable_static_bin" = xyes],
|
||||
[LDFLAGS="$LDFLAGS --static"]
|
||||
[])
|
||||
--- a/configure
|
||||
+++ b/configure
|
||||
@@ -2667,7 +2667,7 @@ else
|
||||
fi
|
||||
|
||||
|
||||
-if test "x$enable_static_bin" == xyes
|
||||
+if test "x$enable_static_bin" = xyes
|
||||
then :
|
||||
LDFLAGS="$LDFLAGS --static"
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
# Copyright 1999-2022 Gentoo Authors
|
||||
# Copyright 1999-2023 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
@ -27,7 +27,6 @@ DOCS=( README.md RELNOTES.md )
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
|
||||
"${FILESDIR}"/${PN}-3.12-fix-bashism.patch
|
||||
"${FILESDIR}"/${PN}-3.12-Unbundle-cJSON.patch
|
||||
)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user