diff options
| author | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2012-05-31 09:23:23 +0200 |
| commit | bdb4c3a6dc9efecc4d1e40fabf8cb9b3e0eb3ee2 (patch) | |
| tree | d6012109e704c5e9abc709c23a7133a3d4b4f779 /package/libtorrent | |
| parent | 5b11223fb6cd0469becf49b0986868832c076bfc (diff) | |
| parent | 2105ecbd86d04e446effa11108f6bd755ed5f19a (diff) | |
Merge branch 'next'
Conflicts:
toolchain/kernel-headers/Config.in
Diffstat (limited to 'package/libtorrent')
| -rw-r--r-- | package/libtorrent/Config.in | 11 | ||||
| -rw-r--r-- | package/libtorrent/libtorrent-cross_compile.patch | 27 | ||||
| -rw-r--r-- | package/libtorrent/libtorrent.mk | 16 |
3 files changed, 54 insertions, 0 deletions
diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in new file mode 100644 index 000000000..f0315a4f3 --- /dev/null +++ b/package/libtorrent/Config.in @@ -0,0 +1,11 @@ +config BR2_PACKAGE_LIBTORRENT + bool "libtorrent" + depends on BR2_INSTALL_LIBSTDCPP + select BR2_PACKAGE_LIBSIGC + help + BitTorrent library written in C++ for *nix + + http://libtorrent.rakshasa.no/ + +comment "libtorrent requires a toolchain with C++ support enabled" + depends on !BR2_INSTALL_LIBSTDCPP diff --git a/package/libtorrent/libtorrent-cross_compile.patch b/package/libtorrent/libtorrent-cross_compile.patch new file mode 100644 index 000000000..39fe700dc --- /dev/null +++ b/package/libtorrent/libtorrent-cross_compile.patch @@ -0,0 +1,27 @@ +Fix cross compilation, based on OpenWRT patch. + +Signed-off-by: Gustavo Zacarias <gustavo@zacarias.com.ar> + +diff -Nura libtorrent-0.13.2/configure.ac libtorrent-0.13.2-cross/configure.ac +--- libtorrent-0.13.2/configure.ac 2012-04-20 03:55:10.000000000 -0300 ++++ libtorrent-0.13.2-cross/configure.ac 2012-05-09 10:57:49.671175421 -0300 +@@ -17,7 +17,6 @@ + + AM_INIT_AUTOMAKE + AM_CONFIG_HEADER(config.h) +-AM_PATH_CPPUNIT(1.9.6) + AC_DISABLE_STATIC + + AM_DISABLE_STATIC +diff -Nura libtorrent-0.13.2/scripts/checks.m4 libtorrent-0.13.2-cross/scripts/checks.m4 +--- libtorrent-0.13.2/scripts/checks.m4 2012-04-12 06:44:23.000000000 -0300 ++++ libtorrent-0.13.2-cross/scripts/checks.m4 2012-05-09 10:42:32.642728917 -0300 +@@ -96,7 +96,7 @@ + AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ + AC_MSG_CHECKING(whether kqueue supports pipes and ptys) + +- AC_RUN_IFELSE([AC_LANG_SOURCE([ ++ AC_LINK_IFELSE([AC_LANG_SOURCE([ + #include <fcntl.h> + #include <stdlib.h> + #include <unistd.h> diff --git a/package/libtorrent/libtorrent.mk b/package/libtorrent/libtorrent.mk new file mode 100644 index 000000000..100e68465 --- /dev/null +++ b/package/libtorrent/libtorrent.mk @@ -0,0 +1,16 @@ +############################################################# +# +# libtorrent +# +############################################################# + +LIBTORRENT_VERSION = 0.13.2 +LIBTORRENT_SITE = http://libtorrent.rakshasa.no/downloads +LIBTORRENT_DEPENDENCIES = host-pkg-config libsigc \ + $(if $(BR2_PACKAGE_OPENSSL),openssl) +LIBTORRENT_CONF_OPT = --enable-aligned \ + $(if $(BR2_PACKAGE_OPENSSL),--enable-openssl,--disable-openssl) +LIBTORRENT_INSTALL_STAGING = YES +LIBTORRENT_AUTORECONF = YES + +$(eval $(call AUTOTARGETS)) |