From: Bert Vermeulen <bert@biot.com>
Date: Tue, 10 May 2016 21:09:05 +0000 (+0200)
Subject: iperf: Drop single-threaded variant
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=34b6c8b0759f2ae68afb2953280e27f23b9d7e5e;p=openwrt%2Fstaging%2Fnbd.git

iperf: Drop single-threaded variant

Signed-off-by: Bert Vermeulen <bert@biot.com>
---

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
-          */