[packages_10.03.1] collectd: backport r29404

[openwrt/svn-archive/archive.git] / net / iperf / Makefile

diff --git a/net/iperf/Makefile b/net/iperf/Makefile
index 373264ba179c8e1a501182d5316e46d47bf101aa..b1bd59f809383b06788dd86fe5261b129268f276 100644 (file)
--- a/net/iperf/Makefile
+++ b/net/iperf/Makefile
@@ -1,30 +1,31 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# $Id$
 
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=iperf
-PKG_VERSION:=2.0.4
-PKG_RELEASE:=2
+PKG_VERSION:=2.0.5
+PKG_RELEASE:=1
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=@SF/$(PKG_NAME)
-PKG_MD5SUM:=8c5bc14cc2ea55f18f22afe3c23e3dcb
+PKG_MD5SUM:=44b5536b67719f4250faed632a3cd016
+
+PKG_BUILD_PARALLEL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
 define Package/iperf/Default
-  SUBMENU:=Monitoring
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:= +uclibcxx
   TITLE:=Internet Protocol bandwidth measuring tool
-  URL:=http://dast.nlanr.net/Projects/Iperf/
+  URL:=http://sourceforge.net/projects/iperf/
 endef
 
 define Package/iperf/Default/description
@@ -33,10 +34,10 @@ define Package/iperf/Default/description
  characteristics.
 endef
 
-
 define Package/iperf
 $(call Package/iperf/Default)
   TITLE+= (with single thread support)
+  VARIANT:=single
 endef
 
 define Package/iperf/description
@@ -44,11 +45,11 @@ $(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
@@ -56,52 +57,29 @@ $(call Package/iperf/Default/description)
  This package is built with multithread support.
 endef
 
+CONFIGURE_ARGS += --disable-multicast
+CONFIGURE_VARS += ac_cv_func_malloc_0_nonnull=yes
 
-define Build/Template
+ifeq ($(BUILD_VARIANT),single)
+  CONFIGURE_ARGS += --disable-threads
+else
+  CONFIGURE_ARGS += --enable-threads=posix
+  CONFIGURE_VARS += ac_cv_func_pthread_cancel=no
+endif
 
-$(STAMP_BUILT)-$(2): $(STAMP_PREPARED)
-       -$(MAKE) -C $(PKG_BUILD_DIR) clean
-       $(call Build/Configure/Default,$(3))
-       $(MAKE) -C $(PKG_BUILD_DIR)
-       ( cd $(PKG_BUILD_DIR)/src; mv -f iperf iperf-$(2) )
-       touch $$@
+TARGET_CXX=g++-uc
 
-$(STAMP_BUILT): $(STAMP_BUILT)-$(2)
+CONFIGURE_VARS += CXXFLAGS="$$$$CXXFLAGS -fno-rtti"
 
-define Package/$(1)/install
-       $(INSTALL_DIR) $$(1)/usr/bin
-       $(INSTALL_BIN) $$(PKG_BUILD_DIR)/src/iperf-$(2) $$(1)/usr/bin/iperf
-endef
+ifeq ($(BUILD_VARIANT),mt)
+  CONFIGURE_VARS += LIBS="-lpthread"
+endif
 
+define Package/iperf/install
+       $(INSTALL_DIR) $(1)/usr/bin
+       $(INSTALL_BIN) $(PKG_BUILD_DIR)/src/iperf $(1)/usr/bin/iperf
 endef
-
-CONFIGURE_ARGS += \
-       --disable-multicast \
-
-CONFIGURE_VARS += \
-       CXX="g++-uc" \
-       CXXFLAGS="$$$$CXX_CFLAGS -fno-rtti" \
-
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_iperf),)
-  define Build/singlethread
-    $(call Build/Template,iperf,singlethread, \
-       --disable-threads \
-    )
-  endef
-endif
-$(eval $(Build/singlethread))
-
-ifneq ($(SDK)$(CONFIG_PACKAGE_iperf-mt),)
-  define Build/multithread
-    $(call Build/Template,iperf-mt,multithread, \
-       --enable-threads=posix \
-       LDFLAGS="$(TARGET_LDFLAGS) -lpthread" \
-       ac_cv_func_pthread_cancel=no \
-    )
-  endef
-endif
-$(eval $(Build/multithread))
+Package/iperf-mt/install = $(Package/iperf/install)
 
 $(eval $(call BuildPackage,iperf))
 $(eval $(call BuildPackage,iperf-mt))