aboutsummaryrefslogtreecommitdiffstats
path: root/package/network/utils
diff options
context:
space:
mode:
authorBert Vermeulen <bert@biot.com>2016-05-10 23:09:05 +0200
committerJohn Crispin <john@phrozen.org>2016-05-12 03:29:36 +0200
commit34b6c8b0759f2ae68afb2953280e27f23b9d7e5e (patch)
treecdbd13e9998687e616521b914f46468b84048415 /package/network/utils
parentb4a23f83f92a42a4969a7c37d9985783234fd74f (diff)
downloadupstream-34b6c8b0759f2ae68afb2953280e27f23b9d7e5e.tar.gz
upstream-34b6c8b0759f2ae68afb2953280e27f23b9d7e5e.tar.bz2
upstream-34b6c8b0759f2ae68afb2953280e27f23b9d7e5e.zip
iperf: Drop single-threaded variant
Signed-off-by: Bert Vermeulen <bert@biot.com>
Diffstat (limited to 'package/network/utils')
-rw-r--r--package/network/utils/iperf/Makefile40
-rw-r--r--package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch14
2 files changed, 4 insertions, 50 deletions
diff --git a/package/network/utils/iperf/Makefile b/package/network/utils/iperf/Makefile
index 0085d34ba1..23832fa785 100644
--- a/package/network/utils/iperf/Makefile
+++ b/package/network/utils/iperf/Makefile
@@ -24,61 +24,29 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/uclibc++.mk
include $(INCLUDE_DIR)/package.mk
-define Package/iperf/Default
+define Package/iperf
SECTION:=net
CATEGORY:=Network
- DEPENDS:= $(CXX_DEPENDS)
+ DEPENDS:= $(CXX_DEPENDS) +libpthread
TITLE:=Internet Protocol bandwidth measuring tool
URL:=http://sourceforge.net/projects/iperf2/
endef
-define Package/iperf/Default/description
+define Package/iperf/description
Iperf is a modern alternative for measuring TCP and UDP bandwidth
performance, allowing the tuning of various parameters and
characteristics.
endef
-define Package/iperf
-$(call Package/iperf/Default)
- TITLE+= (with single thread support)
- VARIANT:=single
-endef
-
-define Package/iperf/description
-$(call Package/iperf/Default/description)
- This package is built with single thread support.
-endef
-
-define Package/iperf-mt
-$(call Package/iperf/Default)
- DEPENDS+= +libpthread
- TITLE+= (with multithread support)
- VARIANT:=mt
-endef
-
-define Package/iperf-mt/description
-$(call Package/iperf/Default/description)
- This package is built with multithread support.
-endef
-
TARGET_CFLAGS += -D_GNU_SOURCE
CONFIGURE_ARGS += --disable-multicast
-ifeq ($(BUILD_VARIANT),single)
- CONFIGURE_ARGS += --disable-threads
-endif
-
CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-rtti"
-
-ifeq ($(BUILD_VARIANT),mt)
- CONFIGURE_VARS += LIBS="-lpthread"
-endif
+CONFIGURE_VARS += LIBS="-lpthread"
define Package/iperf/install
$(INSTALL_DIR) $(1)/usr/bin
$(INSTALL_BIN) $(PKG_BUILD_DIR)/src/iperf $(1)/usr/bin/iperf
endef
-Package/iperf-mt/install = $(Package/iperf/install)
$(eval $(call BuildPackage,iperf))
-$(eval $(call BuildPackage,iperf-mt))
diff --git a/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch b/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch
deleted file mode 100644
index c61c75494a..0000000000
--- a/package/network/utils/iperf/patches/001-set-report-next-time-in-single-thread-mode.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/Reporter.c
-+++ b/src/Reporter.c
-@@ -308,6 +308,11 @@ ReportHeader* InitReport( thread_Setting
- #else
- // set start time
- gettimeofday( &(reporthdr->report.startTime), NULL );
-+
-+ // set next time
-+ reporthdr->report.nextTime = reporthdr->report.startTime;
-+ TimeAdd( reporthdr->report.nextTime, reporthdr->report.intervalTime );
-+
- /*
- * Process the report in this thread
- */