Re: [PATCH 2/3] gnu: libtorrent: Update to 0.13.6.

2015-10-04 Thread Ludovic Courtès
Alex Kost <alez...@gmail.com> skribis:

> From 0fcf4b7368ce6f145a1cd45bd4b675145b5da4dc Mon Sep 17 00:00:00 2001
> From: Alex Kost <alez...@gmail.com>
> Date: Sat, 3 Oct 2015 22:21:33 +0300
> Subject: [PATCH 2/3] gnu: libtorrent: Update to 0.13.6.
>
> * gnu/packages/bittorrent.scm (libtorrent): Update to 0.13.6.
>   [source]: Use new URL.
>   [native-inputs]: Uncomment "cppunit" (for tests).
>   [argument]: Remove (to enable tests).

LGTM!

Ludo'.



Re: [PATCH 2/3] gnu: libtorrent: Update to 0.13.6.

2015-10-03 Thread Andreas Enge
On Sat, Oct 03, 2015 at 10:50:25PM +0300, Alex Kost wrote:
> I had a problem with this one: it was built successfully but when I
> enabled tests, "make check" phase ate all my CPU and memory and after
> several minutes of messing with my HDD, I got:

There was no problem for me (with 8GB of RAM, of which I do not know how
much was used). So from my point of view, you could push these patches.

Andreas




[PATCH 2/3] gnu: libtorrent: Update to 0.13.6.

2015-10-03 Thread Alex Kost
I had a problem with this one: it was built successfully but when I
enabled tests, "make check" phase ate all my CPU and memory and after
several minutes of messing with my HDD, I got:

  g++: internal compiler error: Killed (program cc1plus)

(the backtrace is attached just in case)

I didn't report about it, as I think the problem is that I just have not
enough memory (3 GB), so I appreciate if someone tries to build
libtorrent with tests using this patch, thanks in advance.

>From 0fcf4b7368ce6f145a1cd45bd4b675145b5da4dc Mon Sep 17 00:00:00 2001
From: Alex Kost <alez...@gmail.com>
Date: Sat, 3 Oct 2015 22:21:33 +0300
Subject: [PATCH 2/3] gnu: libtorrent: Update to 0.13.6.

* gnu/packages/bittorrent.scm (libtorrent): Update to 0.13.6.
  [source]: Use new URL.
  [native-inputs]: Uncomment "cppunit" (for tests).
  [argument]: Remove (to enable tests).
---
 gnu/packages/bittorrent.scm | 14 --
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/gnu/packages/bittorrent.scm b/gnu/packages/bittorrent.scm
index c9b0fe2..fb40915 100644
--- a/gnu/packages/bittorrent.scm
+++ b/gnu/packages/bittorrent.scm
@@ -99,26 +99,20 @@ DHT, µTP, PEX and Magnet Links.")
 (define-public libtorrent
   (package
 (name "libtorrent")
-(version "0.13.4")
+(version "0.13.6")
 (source (origin
   (method url-fetch)
   (uri (string-append
-"http://libtorrent.rakshasa.no/downloads/libtorrent-;
+"http://rtorrent.net/downloads/libtorrent-;
 version ".tar.gz"))
   (sha256
(base32
-"0ma910br5vxrfpm4f4w4942lpmhwvqjnnf9h8vpf52fw35qhjkkh"
+"012s1nwcvz5m5r4d2z9klgy2n34kpgn9kgwgzxm97zgdjs6a0f18"
 (build-system gnu-build-system)
 (inputs `(("openssl" ,openssl)
   ("zlib" ,zlib)))
 (native-inputs `(("pkg-config" ,pkg-config)
- ;; Add this when you enable tests:
- ;; ("cppunit" ,cppunit)
- ))
-(arguments
- ;; FIXME: enable tests on the next release:
- ;; https://github.com/rakshasa/libtorrent/issues/59
- `(#:tests? #f))
+ ("cppunit" ,cppunit)))
 (synopsis "BitTorrent library of rtorrent")
 (description
  "LibTorrent is a BitTorrent library used by and developed in parallel
-- 
2.5.0

...
Making check in test
make[1]: Entering directory 
'/tmp/nix-build-libtorrent-0.13.6.drv-0/libtorrent-0.13.6/test'
make  LibTorrentTest
make[2]: Entering directory 
'/tmp/nix-build-libtorrent-0.13.6.drv-0/libtorrent-0.13.6/test'
g++ -DHAVE_CONFIG_H -I. -I..  -I. -I.. -I../src -I/include 
-I/gnu/store/mbg8qp31g1bmvy1x399xivbm8vm3n7ad-cppunit-1.12.1/include -pthread 
-g -O2 -g -DDEBUG -fvisibility=hidden 
-I/gnu/store/p311lij4y6ali5l6rrli1nmcw73ksp5a-openssl-1.0.2d/include  -MT 
LibTorrentTest-main.o -MD -MP -MF .deps/LibTorrentTest-main.Tpo -c -o 
LibTorrentTest-main.o `test -f 'main.cc' || echo './'`main.cc
g++ -DHAVE_CONFIG_H -I. -I..  -I. -I.. -I../src -I/include 
-I/gnu/store/mbg8qp31g1bmvy1x399xivbm8vm3n7ad-cppunit-1.12.1/include -pthread 
-g -O2 -g -DDEBUG -fvisibility=hidden 
-I/gnu/store/p311lij4y6ali5l6rrli1nmcw73ksp5a-openssl-1.0.2d/include  -MT 
../src/LibTorrentTest-thread_disk.o -MD -MP -MF 
../src/.deps/LibTorrentTest-thread_disk.Tpo -c -o 
../src/LibTorrentTest-thread_disk.o `test -f '../src/thread_disk.cc' || echo 
'./'`../src/thread_disk.cc
g++ -DHAVE_CONFIG_H -I. -I..  -I. -I.. -I../src -I/include 
-I/gnu/store/mbg8qp31g1bmvy1x399xivbm8vm3n7ad-cppunit-1.12.1/include -pthread 
-g -O2 -g -DDEBUG -fvisibility=hidden 
-I/gnu/store/p311lij4y6ali5l6rrli1nmcw73ksp5a-openssl-1.0.2d/include  -MT 
rak/LibTorrentTest-allocators_test.o -MD -MP -MF 
rak/.deps/LibTorrentTest-allocators_test.Tpo -c -o 
rak/LibTorrentTest-allocators_test.o `test -f 'rak/allocators_test.cc' || echo 
'./'`rak/allocators_test.cc
mv -f ../src/.deps/LibTorrentTest-thread_disk.Tpo 
../src/.deps/LibTorrentTest-thread_disk.Po
g++ -DHAVE_CONFIG_H -I. -I..  -I. -I.. -I../src -I/include 
-I/gnu/store/mbg8qp31g1bmvy1x399xivbm8vm3n7ad-cppunit-1.12.1/include -pthread 
-g -O2 -g -DDEBUG -fvisibility=hidden 
-I/gnu/store/p311lij4y6ali5l6rrli1nmcw73ksp5a-openssl-1.0.2d/include  -MT 
rak/LibTorrentTest-ranges_test.o -MD -MP -MF 
rak/.deps/LibTorrentTest-ranges_test.Tpo -c -o rak/LibTorrentTest-ranges_test.o 
`test -f 'rak/ranges_test.cc' || echo './'`rak/ranges_test.cc
mv -f .deps/LibTorrentTest-main.Tpo .deps/LibTorrentTest-main.Po
g++ -DHAVE_CONFIG_H -I. -I..  -I. -I.. -I../src -I/include 
-I/gnu/store/mbg8qp31g1bmvy1x399xivbm8vm3n7ad-cppunit-1.12.1/include -pthread 
-g -O2 -g -DDEBUG -fvisibility=hidden 
-I/gnu/store/p311lij4y6ali5l6rrli1nmcw73ksp5a-openssl-1.0.2d/include  -MT 
data/LibTorrentTest-chunk_