diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2010-04-04 10:34:02 +0200 |
| commit | 5042ac8e5927d0089d3902b1c37e5bcc1565d053 (patch) | |
| tree | cd2be3085808c5ac59dd70f9c610c6a40bfe3ffd /package/libtorrent | |
| parent | 401dabf66529cfb5ab47b4c78d5e25fd493eef1f (diff) | |
| parent | 4d569ed1a3305c7b7abe8fa4273cea3b559cc85a (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Conflicts:
BUGS
package/autoconf/Makefile
Diffstat (limited to 'package/libtorrent')
| -rw-r--r-- | package/libtorrent/Config.in | 28 | ||||
| -rw-r--r-- | package/libtorrent/Makefile | 29 | ||||
| -rw-r--r-- | package/libtorrent/patches/patch-src_tracker_tracker_dht_cc | 10 |
3 files changed, 4 insertions, 63 deletions
diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in deleted file mode 100644 index ab8ae5585..000000000 --- a/package/libtorrent/Config.in +++ /dev/null @@ -1,28 +0,0 @@ -config ADK_PACKAGE_LIBTORRENT - prompt "libtorrent........................ bittorrent library" - tristate - default n - depends on ADK_CXX - select ADK_PACKAGE_LIBOPENSSL - select ADK_PACKAGE_LIBSIGCXX - help - http://libtorrent.rakshasa.no/ - -choice -prompt "C++ library to use" -depends on ADK_PACKAGE_LIBTORRENT -default ADK_COMPILE_LIBTORRENT_WITH_STDCXX if ADK_TARGET_LIB_GLIBC -default ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX if ADK_TARGET_LIB_UCLIBC - -config ADK_COMPILE_LIBTORRENT_WITH_STDCXX - bool "Standard C++ library" - select ADK_PACKAGE_LIBSTDCXX - help - -config ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX - bool "Embedded uClibc++ library" - select ADK_PACKAGE_UCLIBCXX - depends on ADK_BROKEN - help - -endchoice diff --git a/package/libtorrent/Makefile b/package/libtorrent/Makefile index 74ab79c9a..ea0de0c28 100644 --- a/package/libtorrent/Makefile +++ b/package/libtorrent/Makefile @@ -4,9 +4,10 @@ include ${TOPDIR}/rules.mk PKG_NAME:= libtorrent -PKG_VERSION:= 0.12.4 +PKG_VERSION:= 0.12.5 PKG_RELEASE:= 1 -PKG_MD5SUM:= 7e4b4c29a69c86c38e3e60ec11fc2255 +PKG_BUILDDEP+= openssl libsigc++ +PKG_MD5SUM:= fe8155d364b220713074423100d4bf29 PKG_DESCR:= A bittorrent library PKG_SECTION:= libs PKG_DEPENDS:= libopenssl libsigc++ @@ -15,34 +16,12 @@ PKG_SITES:= http://libtorrent.rakshasa.no/downloads/ include ${TOPDIR}/mk/package.mk -ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y) -PKG_DEPENDS+= uclibc++ -else -PKG_DEPENDS+= libstdcxx -endif - $(eval $(call PKG_template,LIBTORRENT,${PKG_NAME},${PKG_VERSION}-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) -ifeq ($(ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX),y) -CONFIGURE_ENV+= CXXFLAGS="-fno-builtin -fno-rtti -nostdinc++ -fno-strict-aliasing -fno-inline \ - -I${STAGING_DIR}/usr/include/uClibc++" \ - LIBS="-nodefaultlibs -luClibc++ -lc -lm -lgcc" -endif - -CONFIGURE_STYLE= gnu CONFIGURE_ARGS+= --enable-aligned -BUILD_STYLE= auto -INSTALL_STYLE= auto - -ifeq (${ADK_COMPILE_LIBTORRENT_WITH_UCLIBCXX},y) -# add workaround because libtool tries to link libstdc++ -post-configure: - ${SED} 's#postdeps="-lstdc.*#postdeps=""#' \ - ${WRKBUILD}/libtool -endif post-install: ${INSTALL_DIR} ${IDIR_LIBTORRENT}/usr/lib - ${CP} ${WRKINST}/usr/lib/libtorrent.so.* ${IDIR_LIBTORRENT}/usr/lib/ + ${CP} ${WRKINST}/usr/lib/libtorrent.so* ${IDIR_LIBTORRENT}/usr/lib/ include ${TOPDIR}/mk/pkg-bottom.mk diff --git a/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc b/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc deleted file mode 100644 index 94dc7b1a8..000000000 --- a/package/libtorrent/patches/patch-src_tracker_tracker_dht_cc +++ /dev/null @@ -1,10 +0,0 @@ ---- libtorrent-0.12.4.orig/src/tracker/tracker_dht.cc 2008-08-26 22:18:34.000000000 +0200 -+++ libtorrent-0.12.4/src/tracker/tracker_dht.cc 2009-08-28 17:44:05.940697717 +0200 -@@ -37,6 +37,7 @@ - #include "config.h" - - #include <sstream> -+#include <cstdio> - - #include "dht/dht_router.h" - #include "torrent/connection_manager.h" |