diff options
-rw-r--r-- | meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch | 12 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch | 8 | ||||
-rw-r--r-- | meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb (renamed from meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb) | 6 |
3 files changed, 12 insertions, 14 deletions
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch index 739fd20fc5..09e3d9ca9c 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0001-configure.ac-check-for-CPP-prog.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From cc4499cd4cfcb655fc44c3f3571eee20663dafde Mon Sep 17 00:00:00 2001 | 1 | From 4801363fbff12bf1019aaf90142981702cecff92 Mon Sep 17 00:00:00 2001 |
2 | From: Andrey Zhizhikin <andrey.z@gmail.com> | 2 | From: Andrey Zhizhikin <andrey.z@gmail.com> |
3 | Date: Wed, 3 Feb 2021 20:44:34 +0000 | 3 | Date: Wed, 3 Feb 2021 20:44:34 +0000 |
4 | Subject: [PATCH] configure.ac: check for CPP prog | 4 | Subject: [PATCH] configure.ac: check for CPP prog |
@@ -10,22 +10,20 @@ Absence of check for CPP_PROG causes following build errors: | |||
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> | 12 | Signed-off-by: Andrey Zhizhikin <andrey.z@gmail.com> |
13 | |||
13 | --- | 14 | --- |
14 | configure.ac | 1 + | 15 | configure.ac | 1 + |
15 | 1 file changed, 1 insertion(+) | 16 | 1 file changed, 1 insertion(+) |
16 | 17 | ||
17 | diff --git a/configure.ac b/configure.ac | 18 | diff --git a/configure.ac b/configure.ac |
18 | index 939cf0a..f75b398 100644 | 19 | index 53a4db4..3462b3e 100644 |
19 | --- a/configure.ac | 20 | --- a/configure.ac |
20 | +++ b/configure.ac | 21 | +++ b/configure.ac |
21 | @@ -47,6 +47,7 @@ AC_CANONICAL_HOST | 22 | @@ -48,6 +48,7 @@ AC_CANONICAL_HOST |
22 | # Checks for tools: c compiler, ranlib (used for creating static libraries), | 23 | # Checks for tools: c compiler, ranlib (used for creating static libraries), |
23 | # symlinks and libtool | 24 | # symlinks and libtool |
24 | AC_PROG_CC | 25 | AC_PROG_CC |
25 | +AC_PROG_CPP | 26 | +AC_PROG_CPP |
26 | AC_PROG_RANLIB | 27 | AC_PROG_RANLIB |
27 | AC_PROG_LN_S | 28 | AC_PROG_LN_S |
28 | AC_PROG_LIBTOOL | 29 | LT_INIT |
29 | -- | ||
30 | 2.17.1 | ||
31 | |||
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch index 959e29389c..7870261ee6 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch +++ b/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From 3ae408402635ea21ad90cd722c99ae3334376c91 Mon Sep 17 00:00:00 2001 | 1 | From 155ae12f7809e387a379703d8c09f227e430336d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Fri, 14 Jul 2017 13:00:16 -0700 | 3 | Date: Fri, 14 Jul 2017 13:00:16 -0700 |
4 | Subject: [PATCH] Remove -pg from profile_CFLAGS | 4 | Subject: [PATCH] Remove -pg from profile_CFLAGS |
@@ -7,12 +7,13 @@ musl fails to link with missing gcrt1.o | |||
7 | 7 | ||
8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 8 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> | 9 | Signed-off-by: Mingli Yu <mingli.yu@windriver.com> |
10 | |||
10 | --- | 11 | --- |
11 | src/Makefile.am | 4 ++-- | 12 | src/Makefile.am | 4 ++-- |
12 | 1 file changed, 2 insertions(+), 2 deletions(-) | 13 | 1 file changed, 2 insertions(+), 2 deletions(-) |
13 | 14 | ||
14 | diff --git a/src/Makefile.am b/src/Makefile.am | 15 | diff --git a/src/Makefile.am b/src/Makefile.am |
15 | index 5be8562..3881aa6 100644 | 16 | index 11d3e17..4058cff 100644 |
16 | --- a/src/Makefile.am | 17 | --- a/src/Makefile.am |
17 | +++ b/src/Makefile.am | 18 | +++ b/src/Makefile.am |
18 | @@ -58,9 +58,9 @@ if ENABLE_PROFILING | 19 | @@ -58,9 +58,9 @@ if ENABLE_PROFILING |
@@ -27,6 +28,3 @@ index 5be8562..3881aa6 100644 | |||
27 | endif | 28 | endif |
28 | 29 | ||
29 | # Specify the sources and various flags for the test cases | 30 | # Specify the sources and various flags for the test cases |
30 | -- | ||
31 | 2.21.0 | ||
32 | |||
diff --git a/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb b/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb index 47bf4d5015..a6af23aec9 100644 --- a/meta-oe/recipes-benchmark/iperf3/iperf3_3.9.bb +++ b/meta-oe/recipes-benchmark/iperf3/iperf3_3.11.bb | |||
@@ -4,19 +4,21 @@ iperf is a tool for active measurements of the maximum achievable bandwidth \ | |||
4 | on IP networks. It supports tuning of various parameters related to timing, \ | 4 | on IP networks. It supports tuning of various parameters related to timing, \ |
5 | protocols, and buffers. For each test it reports the bandwidth, loss, and \ | 5 | protocols, and buffers. For each test it reports the bandwidth, loss, and \ |
6 | other parameters." | 6 | other parameters." |
7 | |||
7 | HOMEPAGE = "http://software.es.net/iperf/" | 8 | HOMEPAGE = "http://software.es.net/iperf/" |
8 | SECTION = "console/network" | 9 | SECTION = "console/network" |
9 | BUGTRACKER = "https://github.com/esnet/iperf/issues" | 10 | BUGTRACKER = "https://github.com/esnet/iperf/issues" |
10 | AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport@lbl.gov>" | 11 | AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport@lbl.gov>" |
12 | |||
11 | LICENSE = "BSD-3-Clause" | 13 | LICENSE = "BSD-3-Clause" |
12 | LIC_FILES_CHKSUM = "file://LICENSE;md5=b7fb682e9941a49f1214dcd7441410d7" | 14 | LIC_FILES_CHKSUM = "file://LICENSE;md5=68ae8cfc577a2c8c51bb51e9628e80b7" |
13 | 15 | ||
14 | SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ | 16 | SRC_URI = "git://github.com/esnet/iperf.git;branch=master;protocol=https \ |
15 | file://0002-Remove-pg-from-profile_CFLAGS.patch \ | 17 | file://0002-Remove-pg-from-profile_CFLAGS.patch \ |
16 | file://0001-configure.ac-check-for-CPP-prog.patch \ | 18 | file://0001-configure.ac-check-for-CPP-prog.patch \ |
17 | " | 19 | " |
18 | 20 | ||
19 | SRCREV = "1f8fb13297f3e3e40169ebcd12e171167e394473" | 21 | SRCREV = "76bd67f6e90e239a7686202d2b1b595159826d24" |
20 | 22 | ||
21 | S = "${WORKDIR}/git" | 23 | S = "${WORKDIR}/git" |
22 | 24 | ||