From 1cd31f169fab4ab0ce45617c161da3fec9f7359d Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sun, 31 May 2009 17:53:55 +0200
Subject: fix regressions from ipkg rework

- remove old glib1 lib
- rename glib2 -> glib
- rename libgdbm -> gdbm
- remove obsoleted wireless-tools, use iw
- remove upstream unmaintained slurm

make allmodconfig runs through on Debian/lenny amd64 for
alix1c target
---
 package/rtorrent/Config.in | 25 +++++++++++++++++++++++--
 package/rtorrent/Makefile  |  6 ++++++
 2 files changed, 29 insertions(+), 2 deletions(-)

(limited to 'package/rtorrent')

diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in
index b46b395ef..58e0fa6bf 100644
--- a/package/rtorrent/Config.in
+++ b/package/rtorrent/Config.in
@@ -1,11 +1,32 @@
 config ADK_PACKAGE_RTORRENT
-	prompt "rtorrent........................... file transfer utility"
+	prompt "rtorrent........................... console bittorrent client"
 	tristate
 	depends on ADK_CXX
+	# libtorrent / rtorrent does not work with uclibc++
+	# with gcc 4.4 libstdc++ needs TLS in uClibc
+	depends on ADK_TARGET_LIB_GLIBC
 	select ADK_PACKAGE_LIBNCURSES
 	select ADK_PACKAGE_LIBTORRENT
 	select ADK_PACKAGE_LIBCURL
 	default n
 	help
-	  http://rsync.samba.org
+	  http://libtorrent.rakshasa.no/
 
+choice
+prompt "C++ library to use"
+depends on ADK_PACKAGE_RTORRENT
+default ADK_COMPILE_RTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC
+default ADK_COMPILE_RTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC
+
+config ADK_COMPILE_RTORRENT_WITH_STDCXX
+	bool "Standard C++ library"
+	select ADK_PACKAGE_LIBSTDCXX
+	help
+
+config ADK_COMPILE_RTORRENT_WITH_UCLIBCXX
+	bool "Embedded uClibc++ library"
+	select ADK_PACKAGE_UCLIBCXX
+	depends ADK_BROKEN
+	help
+
+endchoice
diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile
index 2186c597e..1b6723f86 100644
--- a/package/rtorrent/Makefile
+++ b/package/rtorrent/Makefile
@@ -19,6 +19,12 @@ include ${TOPDIR}/mk/package.mk
 
 $(eval $(call PKG_template,RTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION}))
 
+ifeq ($(ADK_COMPILE_RTORRENT_WITH_UCLIBCXX),y)
+CONFIGURE_ENV+=		CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \
+			-I${STAGING_DIR}/usr/include/uClibc++" \
+			LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc"
+endif
+
 CONFIGURE_STYLE:=	autotool gnu
 CONFIGURE_ARGS+=	--enable-aligned
 BUILD_STYLE:=		auto
-- 
cgit v1.2.3