mirror of
git://git.openembedded.org/meta-openembedded
synced 2026-05-17 06:32:20 +00:00
iperf3 :upgrade to 3.1
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Chunrong Guo
Martin Jansa
parent
e44f49baac
commit
21fe8a55f6
@ -2,18 +2,16 @@ Pass the 'foreign' option to automake to enable iperf3 to build.
|
||||
|
||||
Upstream-Status: Inappropriate [configuration]
|
||||
|
||||
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
|
||||
---
|
||||
Signed-off-by: Chunrong Guo <b40290@freescale.com>
|
||||
|
||||
diff -rupN iperf-3.0.10.old/configure.ac iperf-3.0.10/configure.ac
|
||||
--- iperf-3.0.10.old/configure.ac 2014-12-16 13:39:58.000000000 -0600
|
||||
+++ iperf-3.0.10/configure.ac 2014-12-29 15:09:27.534992643 -0600
|
||||
@@ -32,7 +32,7 @@ AC_CONFIG_AUX_DIR(config)
|
||||
--- 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/config.h)
|
||||
AM_CONFIG_HEADER(src/iperf_config.h)
|
||||
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
The Makefiles for the examples only work properly when the build is
|
||||
done in the same directory as the source. Fix this in Makefile.am and
|
||||
run bootstrap.sh to regenerate Makefile.in.
|
||||
|
||||
Upstream-Status: Pending [iperf-dev@googlegroups.com]
|
||||
|
||||
Signed-off-by: Ben Shelton <ben.shelton@ni.com>
|
||||
---
|
||||
|
||||
diff -rupN iperf-3.0.10.old/examples/Makefile.am iperf-3.0.10/examples/Makefile.am
|
||||
--- iperf-3.0.10.old/examples/Makefile.am 2014-12-16 13:39:58.000000000 -0600
|
||||
+++ iperf-3.0.10/examples/Makefile.am 2014-12-29 17:12:02.238979626 -0600
|
||||
@@ -2,11 +2,13 @@ noinst_PROGRAMS = mic mis # Build, but
|
||||
|
||||
mic_SOURCES = mic.c
|
||||
mic_CFLAGS = -g
|
||||
-mic_LDADD = ../src/libiperf.la
|
||||
+mic_LDADD = $(top_builddir)/src/libiperf.la
|
||||
mic_LDFLAGS = -g
|
||||
+mic_CPPFLAGS = -I$(top_srcdir)/src
|
||||
|
||||
mis_SOURCES = mis.c
|
||||
mis_CFLAGS = -g
|
||||
-mis_LDADD = ../src/libiperf.la
|
||||
+mis_LDADD = $(top_builddir)/src/libiperf.la
|
||||
mis_LDFLAGS = -g
|
||||
+mis_CPPFLAGS = -I$(top_srcdir)/src
|
||||
|
||||
diff -rupN iperf-3.0.10.old/examples/Makefile.in iperf-3.0.10/examples/Makefile.in
|
||||
--- iperf-3.0.10.old/examples/Makefile.in 2014-12-16 13:39:58.000000000 -0600
|
||||
+++ iperf-3.0.10/examples/Makefile.in 2014-12-29 17:12:07.518979616 -0600
|
||||
@@ -94,7 +94,7 @@ CONFIG_CLEAN_VPATH_FILES =
|
||||
PROGRAMS = $(noinst_PROGRAMS)
|
||||
am_mic_OBJECTS = mic-mic.$(OBJEXT)
|
||||
mic_OBJECTS = $(am_mic_OBJECTS)
|
||||
-mic_DEPENDENCIES = ../src/libiperf.la
|
||||
+mic_DEPENDENCIES = $(top_builddir)/src/libiperf.la
|
||||
AM_V_lt = $(am__v_lt_@AM_V@)
|
||||
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
||||
am__v_lt_0 = --silent
|
||||
@@ -104,7 +104,7 @@ mic_LINK = $(LIBTOOL) $(AM_V_lt) --tag=C
|
||||
$(mic_LDFLAGS) $(LDFLAGS) -o $@
|
||||
am_mis_OBJECTS = mis-mis.$(OBJEXT)
|
||||
mis_OBJECTS = $(am_mis_OBJECTS)
|
||||
-mis_DEPENDENCIES = ../src/libiperf.la
|
||||
+mis_DEPENDENCIES = $(top_builddir)/src/libiperf.la
|
||||
mis_LINK = $(LIBTOOL) $(AM_V_lt) --tag=CC $(AM_LIBTOOLFLAGS) \
|
||||
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(mis_CFLAGS) $(CFLAGS) \
|
||||
$(mis_LDFLAGS) $(LDFLAGS) -o $@
|
||||
@@ -286,12 +286,14 @@ top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
mic_SOURCES = mic.c
|
||||
mic_CFLAGS = -g
|
||||
-mic_LDADD = ../src/libiperf.la
|
||||
+mic_LDADD = $(top_builddir)/src/libiperf.la
|
||||
mic_LDFLAGS = -g
|
||||
+mic_CPPFLAGS = -I$(top_srcdir)/src
|
||||
mis_SOURCES = mis.c
|
||||
mis_CFLAGS = -g
|
||||
-mis_LDADD = ../src/libiperf.la
|
||||
+mis_LDADD = $(top_builddir)/src/libiperf.la
|
||||
mis_LDFLAGS = -g
|
||||
+mis_CPPFLAGS = -I$(top_srcdir)/src
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@@ -375,32 +377,32 @@ distclean-compile:
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
|
||||
|
||||
mic-mic.o: mic.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mic_CFLAGS) $(CFLAGS) -MT mic-mic.o -MD -MP -MF $(DEPDIR)/mic-mic.Tpo -c -o mic-mic.o `test -f 'mic.c' || echo '$(srcdir)/'`mic.c
|
||||
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mic_CPPFLAGS) $(CPPFLAGS) $(mic_CFLAGS) $(CFLAGS) -MT mic-mic.o -MD -MP -MF $(DEPDIR)/mic-mic.Tpo -c -o mic-mic.o `test -f 'mic.c' || echo '$(srcdir)/'`mic.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mic-mic.Tpo $(DEPDIR)/mic-mic.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mic.c' object='mic-mic.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mic_CFLAGS) $(CFLAGS) -c -o mic-mic.o `test -f 'mic.c' || echo '$(srcdir)/'`mic.c
|
||||
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mic_CPPFLAGS) $(CPPFLAGS) $(mic_CFLAGS) $(CFLAGS) -c -o mic-mic.o `test -f 'mic.c' || echo '$(srcdir)/'`mic.c
|
||||
|
||||
mic-mic.obj: mic.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mic_CFLAGS) $(CFLAGS) -MT mic-mic.obj -MD -MP -MF $(DEPDIR)/mic-mic.Tpo -c -o mic-mic.obj `if test -f 'mic.c'; then $(CYGPATH_W) 'mic.c'; else $(CYGPATH_W) '$(srcdir)/mic.c'; fi`
|
||||
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mic_CPPFLAGS) $(CPPFLAGS) $(mic_CFLAGS) $(CFLAGS) -MT mic-mic.obj -MD -MP -MF $(DEPDIR)/mic-mic.Tpo -c -o mic-mic.obj `if test -f 'mic.c'; then $(CYGPATH_W) 'mic.c'; else $(CYGPATH_W) '$(srcdir)/mic.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mic-mic.Tpo $(DEPDIR)/mic-mic.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mic.c' object='mic-mic.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mic_CFLAGS) $(CFLAGS) -c -o mic-mic.obj `if test -f 'mic.c'; then $(CYGPATH_W) 'mic.c'; else $(CYGPATH_W) '$(srcdir)/mic.c'; fi`
|
||||
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mic_CPPFLAGS) $(CPPFLAGS) $(mic_CFLAGS) $(CFLAGS) -c -o mic-mic.obj `if test -f 'mic.c'; then $(CYGPATH_W) 'mic.c'; else $(CYGPATH_W) '$(srcdir)/mic.c'; fi`
|
||||
|
||||
mis-mis.o: mis.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mis_CFLAGS) $(CFLAGS) -MT mis-mis.o -MD -MP -MF $(DEPDIR)/mis-mis.Tpo -c -o mis-mis.o `test -f 'mis.c' || echo '$(srcdir)/'`mis.c
|
||||
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mis_CPPFLAGS) $(CPPFLAGS) $(mis_CFLAGS) $(CFLAGS) -MT mis-mis.o -MD -MP -MF $(DEPDIR)/mis-mis.Tpo -c -o mis-mis.o `test -f 'mis.c' || echo '$(srcdir)/'`mis.c
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mis-mis.Tpo $(DEPDIR)/mis-mis.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mis.c' object='mis-mis.o' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mis_CFLAGS) $(CFLAGS) -c -o mis-mis.o `test -f 'mis.c' || echo '$(srcdir)/'`mis.c
|
||||
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mis_CPPFLAGS) $(CPPFLAGS) $(mis_CFLAGS) $(CFLAGS) -c -o mis-mis.o `test -f 'mis.c' || echo '$(srcdir)/'`mis.c
|
||||
|
||||
mis-mis.obj: mis.c
|
||||
-@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mis_CFLAGS) $(CFLAGS) -MT mis-mis.obj -MD -MP -MF $(DEPDIR)/mis-mis.Tpo -c -o mis-mis.obj `if test -f 'mis.c'; then $(CYGPATH_W) 'mis.c'; else $(CYGPATH_W) '$(srcdir)/mis.c'; fi`
|
||||
+@am__fastdepCC_TRUE@ $(AM_V_CC)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mis_CPPFLAGS) $(CPPFLAGS) $(mis_CFLAGS) $(CFLAGS) -MT mis-mis.obj -MD -MP -MF $(DEPDIR)/mis-mis.Tpo -c -o mis-mis.obj `if test -f 'mis.c'; then $(CYGPATH_W) 'mis.c'; else $(CYGPATH_W) '$(srcdir)/mis.c'; fi`
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/mis-mis.Tpo $(DEPDIR)/mis-mis.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='mis.c' object='mis-mis.obj' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
-@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) $(mis_CFLAGS) $(CFLAGS) -c -o mis-mis.obj `if test -f 'mis.c'; then $(CYGPATH_W) 'mis.c'; else $(CYGPATH_W) '$(srcdir)/mis.c'; fi`
|
||||
+@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(mis_CPPFLAGS) $(CPPFLAGS) $(mis_CFLAGS) $(CFLAGS) -c -o mis-mis.obj `if test -f 'mis.c'; then $(CYGPATH_W) 'mis.c'; else $(CYGPATH_W) '$(srcdir)/mis.c'; fi`
|
||||
|
||||
mostlyclean-libtool:
|
||||
-rm -f *.lo
|
||||
@ -9,16 +9,15 @@ 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=ab59a0c3a4bc3954d1ece68ea19d77a4"
|
||||
LIC_FILES_CHKSUM = "file://LICENSE;md5=062ab1bc33fae1926387ac1274cb0873"
|
||||
|
||||
SRC_URI = "\
|
||||
git://github.com/esnet/iperf.git;branch=3.0-STABLE \
|
||||
git://github.com/esnet/iperf.git \
|
||||
file://automake-foreign.patch \
|
||||
file://fix-examples.patch \
|
||||
"
|
||||
|
||||
PV = "3.0.10+gitr${SRCPV}"
|
||||
SRCREV = "de420cc741dd8967ebc57f80b7712556442de81b"
|
||||
PV = "3.1+gitr${SRCPV}"
|
||||
SRCREV = "e396134952a01199326665d1df7c51ae9e62e945"
|
||||
|
||||
S = "${WORKDIR}/git"
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user