diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-05-30 22:59:29 +0200 |
| commit | fb6cd4f4dff71a803ba9db7751ade84fa6eac3a8 (patch) | |
| tree | 379626b7b419ac1643131a7b8ac07e9fb87b9f80 /package/iperf | |
| parent | 5157a34410fe9eff94d5de7100cbc3659d6c4fcb (diff) | |
| parent | ba3359722cbf8aa7b0ed39e1f81d1d74ec88fecd (diff) | |
Merge branch 'master' of ssh://openadk.org/git/openadk
resolve conflicts
Conflicts:
mk/pkg-bottom.mk
package/ctorrent/Makefile
package/gcc/Makefile
package/gmp/Makefile
package/id3lib/Makefile
package/libelf/Makefile
package/libnl/patches/patch-include_netlink-local_h
package/mpd/Makefile
package/nmap/Makefile
package/rrs/Makefile
package/weechat/Makefile
scripts/rstrip.sh
target/Config.in
Diffstat (limited to 'package/iperf')
| -rw-r--r-- | package/iperf/Makefile | 14 | ||||
| -rw-r--r-- | package/iperf/ipkg/iperf.control | 5 |
2 files changed, 12 insertions, 7 deletions
diff --git a/package/iperf/Makefile b/package/iperf/Makefile index 5434be2b9..3796df176 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -9,11 +9,21 @@ PKG_NAME:= iperf PKG_VERSION:= 2.0.4 PKG_RELEASE:= 1 PKG_MD5SUM:= 8c5bc14cc2ea55f18f22afe3c23e3dcb -MASTER_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} +PKG_DESCR:= Internet Protocol bandwidth measuring tool +PKG_SECTION:= net +PKG_DEPENDS:= libpthread +PKG_URL:= http://sourceforge.net/projects/iperf +PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} include ${TOPDIR}/mk/package.mk -$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE})) +ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y) +PKG_DEPENDS+= uclibc++ +else +PKG_DEPENDS+= libstdcxx +endif + +$(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) CONFIGURE_STYLE= gnu BUILD_STYLE= auto diff --git a/package/iperf/ipkg/iperf.control b/package/iperf/ipkg/iperf.control deleted file mode 100644 index b58436f6e..000000000 --- a/package/iperf/ipkg/iperf.control +++ /dev/null @@ -1,5 +0,0 @@ -Package: iperf -Priority: optional -Section: net -Depends: uclibc++, libgcc, libpthread -Description: Internet Protocol bandwidth measuring tool. |