diff options
Diffstat (limited to 'external/meta-openembedded/meta-oe/recipes-benchmark/iperf3')
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch | 15 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch | 17 | ||||
| -rw-r--r-- | external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb (renamed from external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb) | 9 |
3 files changed, 11 insertions, 30 deletions
diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch index 06eb41ac..959e2938 100644 --- a/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch @@ -1,31 +1,32 @@ -From 6db0e28f906bc3784019dfb5bb011237a8034fda Mon Sep 17 00:00:00 2001 +From 3ae408402635ea21ad90cd722c99ae3334376c91 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 14 Jul 2017 13:00:16 -0700 -Subject: [PATCH 2/2] Remove -pg from profile_CFLAGS +Subject: [PATCH] Remove -pg from profile_CFLAGS musl fails to link with missing gcrt1.o Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 23b0c72..6268145 100644 +index 5be8562..3881aa6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g +@@ -58,9 +58,9 @@ if ENABLE_PROFILING iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) + $(libiperf_la_SOURCES) -iperf3_profile_CFLAGS = -pg -g +iperf3_profile_CFLAGS = -g iperf3_profile_LDADD = libiperf.la -iperf3_profile_LDFLAGS = -pg -g +iperf3_profile_LDFLAGS = -g + endif # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c -- -2.13.3 +2.21.0 diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch b/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch deleted file mode 100644 index 06c394e5..00000000 --- a/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch +++ /dev/null @@ -1,17 +0,0 @@ -Pass the 'foreign' option to automake to enable iperf3 to build. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Chunrong Guo <b40290@freescale.com> - ---- a/configure.ac 2015-10-19 02:49:30.471867352 -0500 -+++ b/configure.ac 2015-10-19 02:46:36.207873572 -0500 -@@ -33,7 +33,7 @@ - - - # Initialize the automake system --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(src/iperf_config.h) - diff --git a/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb b/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb index 4e11d823..98d2faab 100644 --- a/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb +++ b/external/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb @@ -8,17 +8,16 @@ HOMEPAGE = "http://software.es.net/iperf/" SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues" AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport@lbl.gov>" -LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a9a036136b748453e839c0eb8906ef2e" +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9088fe7ffdccd042f7645f1012d7f70" DEPENDS = "openssl" SRC_URI = "git://github.com/esnet/iperf.git \ - file://automake-foreign.patch \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ " -SRCREV = "88f3ad87f38762081a6d7127890ff5c3a052b06a" +SRCREV = "dfcea9f6a09ead01089a3c9d20c7032f2c0af2c1" S = "${WORKDIR}/git" @@ -29,5 +28,3 @@ PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sc CFLAGS += "-D_GNU_SOURCE" EXTRA_OECONF = "--with-openssl=${RECIPE_SYSROOT}${prefix}" - -BBCLASSEXTEND = "native" |