Hi,
I would be interested in merging this as more and more people tend to use iperf3 instead of the legacy one.
However, the patch has some whitespace issues. Could you resend it like the other ones? Also fix authorship and the other usual things.
Regarding the build error: Don't change the release tarball. You can use sed to remove the "-pg" flag from src/Makefile.am and then run autoreconf -vfi. After that run ./configure ... && make && make install and the issue should be gone.
gcc -pg would add some debugging information for gprof which is handy for development but not useful in release builds.
Best, -Michael
On Wed, 2015-12-23 at 14:29 +0100, Jonatan Schlag wrote:
Hi, I build iPerf3 for IPFire, (for reasons look here: http://forum.ipfire.org/vie wtopic.php?f=50&t=15498) and was told that i should submit changes to the mailing list.
Here is a patch with all changes:
Signed-off-by: Jonatan Schlag jonatan@familyschlag.de
From a403b42f389cd5617937a0df220c67e279236034 Mon Sep 17 00:00:00 2001 From: jonaschl jonnyschlag@gmail.com Date: Wed, 23 Dec 2015 13:43:20 +0100 Subject: [PATCH] new package iPerf 3
email: jonnyschlag@gmail.com author: jonaschl
config/rootfiles/packages/iperf3 | 10 +++++ lfs/iperf3 | 84 ++++++++++++++++++++++++++++++++++++++++ make.sh | 1 + 3 files changed, 95 insertions(+) create mode 100644 config/rootfiles/packages/iperf3 create mode 100644 lfs/iperf3
diff --git a/config/rootfiles/packages/iperf3 b/config/rootfiles/packages/iperf3 new file mode 100644 index 0000000..717cc96 --- /dev/null +++ b/config/rootfiles/packages/iperf3 @@ -0,0 +1,10 @@ +usr/bin/iperf3 +#usr/include/iperf_api.h +usr/lib/libiperf.a +usr/lib/libiperf.la +usr/lib/libiperf.so +usr/lib/libiperf.so.0 +usr/lib/libiperf.so.0.0.0 +#usr/share/man/man1/iperf3.1 +#usr/share/man/man3/libiperf.3
diff --git a/lfs/iperf3 b/lfs/iperf3 new file mode 100644 index 0000000..b8e0cd2 --- /dev/null +++ b/lfs/iperf3 @@ -0,0 +1,84 @@ +############################################################################# ## +# # +# IPFire.org - A linux based firewall # +# Copyright (C) 2007-2015 IPFire Team info@ipfire.org # +# # +# This program is free software: you can redistribute it and/or modify # +# it under the terms of the GNU General Public License as published by # +# the Free Software Foundation, either version 3 of the License, or # +# (at your option) any later version. # +# # +# This program is distributed in the hope that it will be useful, # +# but WITHOUT ANY WARRANTY; without even the implied warranty of # +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # +# GNU General Public License for more details. # +# # +# You should have received a copy of the GNU General Public License # +# along with this program. If not, see http://www.gnu.org/licenses/. # +# # +############################################################################# ##
+############################################################################# ## +# Definitions +############################################################################# ##
+include Config
+VER = 3.1.1
+THISAPP = iperf3-$(VER) +DL_FILE = $(THISAPP).tar.gz +DL_FROM = $(URL_IPFIRE) +DIR_APP = $(DIR_SRC)/$(THISAPP) +TARGET = $(DIR_INFO)/$(THISAPP) +PROG = iperf3 +PAK_VER = 1
+DEPS = ""
+############################################################################# ## +# Top-level Rules +############################################################################# ##
+objects = $(DL_FILE)
+$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
+$(DL_FILE)_MD5 = 62e3d2a057cca69e88ebfbf35b7483ef
+install : $(TARGET)
+check : $(patsubst %,$(DIR_CHK)/%,$(objects))
+download :$(patsubst %,$(DIR_DL)/%,$(objects))
+md5 : $(subst %,%_MD5,$(objects))
+dist:
- @$(PAK)
+############################################################################# ## +# Downloading, checking, md5sum +############################################################################# ##
+$(patsubst %,$(DIR_CHK)/%,$(objects)) :
- @$(CHECK)
+$(patsubst %,$(DIR_DL)/%,$(objects)) :
- @$(LOAD)
+$(subst %,%_MD5,$(objects)) :
- @$(MD5)
+############################################################################# ## +# Installation Details +############################################################################# ##
+$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
- @$(PREBUILD)
- @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
- cd $(DIR_APP) && ./configure --prefix=/usr
- cd $(DIR_APP) && make $(MAKETUNING)
- cd $(DIR_APP) && make install
- @rm -rf $(DIR_APP)
- @$(POSTBUILD)
diff --git a/make.sh b/make.sh index 39089cd..b184115 100755 --- a/make.sh +++ b/make.sh @@ -740,6 +740,7 @@ buildipfire() { ipfiremake gutenprint ipfiremake apcupsd ipfiremake iperf
- ipfiremake iperf3
ipfiremake netcat ipfiremake 7zip ipfiremake lynis -- 2.1.4
I do not know if i do all right, in the moment I am not so familiar with git and patches.
In addition I have a question. When I build iPerf 3 I run into a bug (see http s://github.com/esnet/iperf/issues/337). I modified the source package and now iPerf 3 build. There are c flags which are incompatible. What is the better style to modify the source package and use this source package or to create a patch (what I try but I fail) and use the original source package and patch it during the build process? The source package what I use in the moment could be find here: http://forum.ipfire.org/download/file.php?id=1853
Yours sincerely Jonatan Schlag