From f3e84309257b915cb8820917a8dd5578f02fe974 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 24 May 2009 20:11:16 +0200
Subject: patches and update for gcc 4.4.0 allmodconfig

* update gcc to 4.4.0
* update gnutls and ruby
* fix c++ issues for some packages
---
 package/iperf/Config.in | 17 +++++++++++++++++
 package/iperf/Makefile  |  7 ++++---
 2 files changed, 21 insertions(+), 3 deletions(-)

(limited to 'package/iperf')

diff --git a/package/iperf/Config.in b/package/iperf/Config.in
index c498a5b16..bdfee6913 100644
--- a/package/iperf/Config.in
+++ b/package/iperf/Config.in
@@ -11,3 +11,20 @@ config ADK_PACKAGE_IPERF
 	  
 	  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
+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 358e54724..411614d41 100644
--- a/package/iperf/Makefile
+++ b/package/iperf/Makefile
@@ -16,14 +16,15 @@ include ${TOPDIR}/mk/package.mk
 $(eval $(call PKG_template,IPERF,iperf,${PKG_VERSION}-${PKG_RELEASE},${ARCH}))
 
 CONFIGURE_STYLE=	gnu
-CONFIGURE_ENV+=		ac_cv_func_malloc_0_nonnull=yes \
-			LIBS="-lc -lm -lgcc_s -lpthread"
 BUILD_STYLE=		auto
 INSTALL_STYLE=		auto
-ifeq ($(ADK_TARGET_LIB_UCLIBCXX),y)
+
+ifeq ($(ADK_COMPILE_IPERF_WITH_UCLIBCXX),y)
 TCXXFLAGS+=		-fno-builtin -fno-rtti -nostdinc++
 TLDFLAGS+=		-nodefaultlibs
 CONFIGURE_ENV+=		LIBS="-luClibc++ -lc -lm -lgcc_s -lpthread"
+else
+CONFIGURE_ENV+=		LIBS="-lc -lm -lgcc_s -lpthread"
 endif
 
 post-install:
-- 
cgit v1.2.3