From 15f7f8f402eab5b7cd03094c358435c4c880b5b6 Mon Sep 17 00:00:00 2001 From: Waldemar Brodkorb Date: Sun, 22 Nov 2009 11:36:13 +0100 Subject: more bulk build fixes - update rtorrent, libtorrent and libsigc++ - add skeleton for cfinstaller - fix uclibc samba compile - fix parallel builds - update tcl - update iw - remove mac80211 package, use kernel integrated drivers - mark packages which can not be compiled parallel (make -j2) --- package/rtorrent/Config.in | 9 ++++++++- package/rtorrent/Makefile | 7 +++---- package/rtorrent/patches/patch-configure_ac | 11 ----------- package/rtorrent/patches/patch-src_display_utils_h | 11 ----------- 4 files changed, 11 insertions(+), 27 deletions(-) delete mode 100644 package/rtorrent/patches/patch-configure_ac delete mode 100644 package/rtorrent/patches/patch-src_display_utils_h (limited to 'package/rtorrent') diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in index 19df602aa..e1d033315 100644 --- a/package/rtorrent/Config.in +++ b/package/rtorrent/Config.in @@ -12,11 +12,18 @@ config ADK_PACKAGE_RTORRENT 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_STDCXX if ADK_TARGET_LIB_GLIBC || ADK_TARGET_LIB_EGLIBC +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 on ADK_BROKEN + help + endchoice diff --git a/package/rtorrent/Makefile b/package/rtorrent/Makefile index e068e8eb4..c2de864ba 100644 --- a/package/rtorrent/Makefile +++ b/package/rtorrent/Makefile @@ -4,9 +4,9 @@ include ${TOPDIR}/rules.mk PKG_NAME:= rtorrent -PKG_VERSION:= 0.8.4 +PKG_VERSION:= 0.8.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= dc0f37d933b0b6c713ad617e09441f3b +PKG_MD5SUM:= e701095e1824b7e512a17000f4c0a783 PKG_DESCR:= console torrent application PKG_SECTION:= net PKG_DEPENDS:= libncurses libtorrent libcurl @@ -23,8 +23,7 @@ CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ \ LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" endif -CONFIGURE_STYLE:= autotool gnu -CONFIGURE_ARGS+= --enable-aligned +CONFIGURE_STYLE:= gnu BUILD_STYLE:= auto INSTALL_STYLE:= auto diff --git a/package/rtorrent/patches/patch-configure_ac b/package/rtorrent/patches/patch-configure_ac deleted file mode 100644 index a0252588f..000000000 --- a/package/rtorrent/patches/patch-configure_ac +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/configure.ac 2008-05-07 14:19:12.000000000 +0200 -+++ rtorrent-0.8.2/configure.ac 2008-12-14 22:11:22.000000000 +0100 -@@ -15,7 +15,6 @@ TORRENT_DISABLE_IPV6 - - AC_SYS_LARGEFILE - --TORRENT_CHECK_EXECINFO() - TORRENT_OTFD() - - TORRENT_ENABLE_ARCH diff --git a/package/rtorrent/patches/patch-src_display_utils_h b/package/rtorrent/patches/patch-src_display_utils_h deleted file mode 100644 index 30f0eabe1..000000000 --- a/package/rtorrent/patches/patch-src_display_utils_h +++ /dev/null @@ -1,11 +0,0 @@ -$Id: update-patches 24 2008-08-31 14:56:13Z wbx $ ---- rtorrent-0.8.2.orig/src/display/utils.h 2008-05-07 14:19:11.000000000 +0200 -+++ rtorrent-0.8.2/src/display/utils.h 2009-05-29 01:25:58.000000000 +0200 -@@ -38,6 +38,7 @@ - #define RTORRENT_DISPLAY_UTILS_H - - #include -+#include - #include - - namespace core { -- cgit v1.2.3