From b6f9dd2a389c1f4da858c928bf48f8baec461082 Mon Sep 17 00:00:00 2001 From: Anton Kolesov Date: Thu, 31 Jul 2014 17:24:49 +0400 Subject: [PATCH] libtorrent: Add dependency on atomic intrinsics Libtorrent requires GCC built-in atomic functions which are architecture specific and may not be implemented. This fixes: http://autobuild.buildroot.net/results/51414e22c8ea47c38df20d864526a370c5a895d7/ Signed-off-by: Anton Kolesov Signed-off-by: Thomas Petazzoni --- package/libtorrent/Config.in | 9 ++++----- package/rtorrent/Config.in | 9 ++++----- 2 files changed, 8 insertions(+), 10 deletions(-) diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in index a21bf95f71..a706d9814c 100644 --- a/package/libtorrent/Config.in +++ b/package/libtorrent/Config.in @@ -2,14 +2,13 @@ config BR2_PACKAGE_LIBTORRENT bool "libtorrent" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - # ARC GCC doesn't support atomic instructions required by this lib - depends on !BR2_arc + depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS select BR2_PACKAGE_LIBSIGC help BitTorrent library written in C++ for *nix http://libtorrent.rakshasa.no/ -comment "libtorrent needs a toolchain w/ C++, threads" - depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS - depends on !BR2_arc +comment "libtorrent needs a toolchain w/ C++, threads, atomic intrinsics" + depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS \ + || !BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in index fa81cded63..1efc5f1cf0 100644 --- a/package/rtorrent/Config.in +++ b/package/rtorrent/Config.in @@ -4,8 +4,7 @@ config BR2_PACKAGE_RTORRENT depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - # ARC GCC doesn't support atomic instructions required by libtorrent - depends on !BR2_arc + depends on BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS # libtorrent select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBSIGC select BR2_PACKAGE_LIBTORRENT @@ -16,7 +15,7 @@ config BR2_PACKAGE_RTORRENT http://libtorrent.rakshasa.no/ -comment "rtorrent needs a toolchain w/ C++, threads, wchar" +comment "rtorrent needs a toolchain w/ C++, threads, wchar, atomic intrinsics" depends on BR2_USE_MMU - depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) - depends on !BR2_arc + depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS \ + && BR2_TOOLCHAIN_HAS_ATOMIC_INTRINSICS) -- 2.30.2