add iperf package (thanks to Oliver Ertl)

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1942 3c298f89-4303-0410-b956-a3cf2f4a3e73

5 files changed, 94 insertions, 0 deletions

diff --git a/openwrt/package/Config.in b/openwrt/package/Config.in
index cdc32b001a..55a8bbd910 100644
--- a/openwrt/package/Config.in
+++ b/openwrt/package/Config.in
@@ -62,6 +62,7 @@ source "package/howl/Config.in"
 source "package/hostapd/Config.in"
 source "package/htpdate/Config.in"
 source "package/iproute2/Config.in"
+source "package/iperf/Config.in"
 source "package/ipset/Config.in"
 source "package/kismet/Config.in"
 source "package/l2tpd/Config.in"
diff --git a/openwrt/package/Makefile b/openwrt/package/Makefile
index 4386582291..067dfea82b 100644
--- a/openwrt/package/Makefile
+++ b/openwrt/package/Makefile
@@ -51,6 +51,7 @@ package-$(BR2_PACKAGE_HOSTAPD) += hostapd
 package-$(BR2_PACKAGE_HOWL) += howl
 package-$(BR2_PACKAGE_HTPDATE) += htpdate
 package-$(BR2_PACKAGE_ID3LIB) += id3lib
+package-$(BR2_PACKAGE_IPERF) += iperf
 package-$(BR2_PACKAGE_IPKG) += ipkg
 package-$(BR2_PACKAGE_IPROUTE2) += iproute2
 package-$(BR2_PACKAGE_IPSET) += ipset
diff --git a/openwrt/package/iperf/Config.in b/openwrt/package/iperf/Config.in
new file mode 100644
index 0000000000..22eedef0c9
--- /dev/null
+++ b/openwrt/package/iperf/Config.in
@@ -0,0 +1,12 @@
+config BR2_PACKAGE_IPERF
+	tristate "iperf - Internet Protocol bandwidth measuring tool"
+#	default m if CONFIG_DEVEL
+	default n
+	help
+	  Iperf is a modern alternative for measuring TCP and UDP bandwidth 
+	  performance, allowing the tuning of various parameters and 
+	  characteristics.
+	  
+	  http://dast.nlanr.net/Projects/Iperf/
+	  
+
diff --git a/openwrt/package/iperf/Makefile b/openwrt/package/iperf/Makefile
new file mode 100644
index 0000000000..872edd25e5
--- /dev/null
+++ b/openwrt/package/iperf/Makefile
@@ -0,0 +1,70 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=iperf
+PKG_VERSION:=2.0.2
+PKG_RELEASE:=1
+PKG_MD5SUM:=bb658aba58a5af0356f5b1342dfe8f53
+
+PKG_SOURCE_URL:=http://dast.nlanr.net/Projects/Iperf2.0
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_CAT:=zcat
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL_DIR:=$(PKG_BUILD_DIR)/ipkg-install
+
+include $(TOPDIR)/package/rules.mk
+
+$(eval $(call PKG_template,IPERF,iperf,$(PKG_VERSION)-$(PKG_RELEASE),$(ARCH)))
+
+$(PKG_BUILD_DIR)/.configured: $(PKG_BUILD_DIR)/.prepared
+	(cd $(PKG_BUILD_DIR); \
+		$(TARGET_CONFIGURE_OPTS) \
+		CFLAGS="$(TARGET_CFLAGS)" \
+		CPPFLAGS="-I$(STAGING_DIR)/usr/include -I$(STAGING_DIR)/include" \
+		CXXFLAGS="$(TARGET_CFLAGS) -fno-builtin -nostdinc++ -nodefaultlibs" \
+		LDFLAGS="-L$(STAGING_DIR)/usr/lib -L$(STAGING_DIR)/lib" \
+		LIBS="-luClibc++ -lc -lm -lgcc_s" \
+		ac_cv_func_malloc_0_nonnull=yes \
+		./configure \
+			--target=$(GNU_TARGET_NAME) \
+			--host=$(GNU_TARGET_NAME) \
+			--build=$(GNU_HOST_NAME) \
+			--program-prefix="" \
+			--program-suffix="" \
+			--prefix=/usr \
+			--exec-prefix=/usr \
+			--bindir=/usr/bin \
+			--datadir=/usr/share \
+			--includedir=/usr/include \
+			--infodir=/usr/share/info \
+			--libdir=/usr/lib \
+			--libexecdir=/usr/lib \
+			--localstatedir=/var \
+			--mandir=/usr/share/man \
+			--sbindir=/usr/sbin \
+			--sysconfdir=/etc \
+			$(DISABLE_LARGEFILE) \
+			$(DISABLE_NLS) \
+			--enable-shared \
+			--disable-static \
+			--disable-rpath \
+			--disable-multicast \
+			--disable-threads \
+	);
+	touch $@
+
+$(PKG_BUILD_DIR)/.built:
+	rm -rf $(PKG_INSTALL_DIR)
+	mkdir -p $(PKG_INSTALL_DIR)
+	$(MAKE) -C $(PKG_BUILD_DIR) \
+		DESTDIR="$(PKG_INSTALL_DIR)" install
+	touch $@
+
+$(IPKG_IPERF):
+	install -d -m0755 $(IDIR_IPERF)/usr/bin
+	cp -fpR $(PKG_INSTALL_DIR)/usr/bin/iperf $(IDIR_IPERF)/usr/bin
+	$(RSTRIP) $(IDIR_IPERF)
+	$(IPKG_BUILD) $(IDIR_IPERF) $(PACKAGE_DIR)
+
+mostlyclean:
+	-$(MAKE) -C $(PKG_BUILD_DIR) clean
+	rm -f $(PKG_BUILD_DIR)/.built
diff --git a/openwrt/package/iperf/ipkg/iperf.control b/openwrt/package/iperf/ipkg/iperf.control
new file mode 100644
index 0000000000..3970b17d4d
--- /dev/null
+++ b/openwrt/package/iperf/ipkg/iperf.control
@@ -0,0 +1,10 @@
+Package: iperf
+Priority: optional
+Section: net
+Maintainer: OpenWrt Developers Team <openwrt-devel@openwrt.org>, Oliver Ertl <oliver@ertl-net.net>
+Source: http://openwrt.org/cgi-bin/viewcvs.cgi/openwrt/package/iperf/
+Depends: uclibc++
+Description: Internet Protocol bandwidth measuring tool.
+ Iperf is a modern alternative for measuring TCP and UDP bandwidth 
+ performance, allowing the tuning of various parameters and 
+ characteristics.