From 9a6a13469c409cdcc059c2176e8de25a70f074fa Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Tue, 2 Feb 2016 16:31:26 +0100 Subject: [PATCH] libtorrent: use the proper BR2_TOOLCHAIN_HAS_SYNC_x symbols libtorrent uses 1 bytes and 4 bytes __sync built-ins, so let's use the appropriate BR2_TOOLCHAIN_HAS_SYNC_x symbols instead of BR2_ARCH_HAS_ATOMICS. The rtorrent package, which is a reverse dependency of libtorrent, gets fixed as well. Signed-off-by: Thomas Petazzoni Tested-by: "Yann E. MORIN" [yann.morin.1998@free.fr: build-tested on an ARC toolchain without atomics, with CPU 770D] Acked-by: "Yann E. MORIN" --- package/libtorrent/Config.in | 4 ++-- package/rtorrent/Config.in | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package/libtorrent/Config.in b/package/libtorrent/Config.in index 17a1f232e7..4787f9c60d 100644 --- a/package/libtorrent/Config.in +++ b/package/libtorrent/Config.in @@ -2,7 +2,7 @@ config BR2_PACKAGE_LIBTORRENT bool "libtorrent" depends on BR2_INSTALL_LIBSTDCPP depends on BR2_TOOLCHAIN_HAS_THREADS - depends on BR2_ARCH_HAS_ATOMICS + depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_ZLIB help BitTorrent library written in C++ for *nix @@ -10,5 +10,5 @@ config BR2_PACKAGE_LIBTORRENT https://github.com/rakshasa/libtorrent comment "libtorrent needs a toolchain w/ C++, threads" - depends on BR2_ARCH_HAS_ATOMICS + depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 depends on !BR2_INSTALL_LIBSTDCPP || !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/rtorrent/Config.in b/package/rtorrent/Config.in index 0583152824..190e50fe26 100644 --- a/package/rtorrent/Config.in +++ b/package/rtorrent/Config.in @@ -4,7 +4,7 @@ config BR2_PACKAGE_RTORRENT depends on BR2_USE_WCHAR depends on BR2_TOOLCHAIN_HAS_THREADS depends on BR2_USE_MMU # fork() - depends on BR2_ARCH_HAS_ATOMICS # libtorrent + depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 select BR2_PACKAGE_LIBCURL select BR2_PACKAGE_LIBTORRENT select BR2_PACKAGE_NCURSES @@ -16,5 +16,5 @@ config BR2_PACKAGE_RTORRENT comment "rtorrent needs a toolchain w/ C++, threads, wchar" depends on BR2_USE_MMU - depends on BR2_ARCH_HAS_ATOMICS + depends on BR2_TOOLCHAIN_HAS_SYNC_1 && BR2_TOOLCHAIN_HAS_SYNC_4 depends on !(BR2_INSTALL_LIBSTDCPP && BR2_USE_WCHAR && BR2_TOOLCHAIN_HAS_THREADS) -- 2.30.2