diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 11:30:20 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2009-12-24 11:30:20 +0100 |
| commit | 537a2c4eaa446e52c6ba07007eb9ae75998b5580 (patch) | |
| tree | b48cc775042b4274dce470527826007de7a7fa84 /package/iperf | |
| parent | 18b3987c6d890f02c80b976b6cf6835053ef1fe9 (diff) | |
| parent | ce621815fecece2b4d8a4cb7115eb82c1cb7ed44 (diff) | |
Merge commit 'origin/confgen'
finally autogenerate menu Config.in files and Depends.mk
for packages. thx mirabilos
Conflicts:
.gitignore
Makefile
mk/build.mk
package/eglibc/Config.in
package/glibc/Config.in
package/uclibc++/Config.in
package/uclibc/Config.in
rules.mk
Diffstat (limited to 'package/iperf')
| -rw-r--r-- | package/iperf/Config.in | 28 | ||||
| -rw-r--r-- | package/iperf/Makefile | 7 |
2 files changed, 1 insertions, 34 deletions
diff --git a/package/iperf/Config.in b/package/iperf/Config.in deleted file mode 100644 index 3f5c8d323..000000000 --- a/package/iperf/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config ADK_PACKAGE_IPERF - prompt "iperf............................. Internet Protocol bandwidth measuring tool" - tristate - select ADK_PACKAGE_LIBPTHREAD - 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/ - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_IPERF -default ADK_COMPILE_IPERF_WITH_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC -default ADK_COMPILE_IPERF_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_IPERF_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_IPERF_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - help - -endchoice diff --git a/package/iperf/Makefile b/package/iperf/Makefile index dfc9b4732..23231a8d6 100644 --- a/package/iperf/Makefile +++ b/package/iperf/Makefile @@ -6,6 +6,7 @@ include ${TOPDIR}/rules.mk PKG_NAME:= iperf PKG_VERSION:= 2.0.4 PKG_RELEASE:= 1 +PKG_CXX:= IPERF PKG_MD5SUM:= 8c5bc14cc2ea55f18f22afe3c23e3dcb PKG_DESCR:= Internet Protocol bandwidth measuring tool PKG_SECTION:= net @@ -15,12 +16,6 @@ PKG_SITES:= ${MASTER_SITE_SOURCEFORGE:=iperf/} include ${TOPDIR}/mk/package.mk -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 |