diff options
author | Khem Raj <raj.khem@gmail.com> | 2017-07-01 13:15:14 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2017-09-13 17:16:28 -0700 |
commit | 4a1ca6ff12c269b037ae8bcc8197069e4fd3d6a4 (patch) | |
tree | 69c18cce3d6c091dc8b9f5a1ae435847c22a3d0d | |
parent | e52efa1b14fccce059d5be9ec5cd82f42a1ba57e (diff) | |
download | meta-openembedded-4a1ca6ff12c269b037ae8bcc8197069e4fd3d6a4.tar.gz |
libtorrent: Link in 64bit atomics for ppc
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
(cherry picked from commit a899acc81caa68824374f8b4948377e7b82fca2f)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
-rw-r--r-- | meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch | 30 | ||||
-rw-r--r-- | meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb | 1 |
2 files changed, 31 insertions, 0 deletions
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch b/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch new file mode 100644 index 000000000..4d0979710 --- /dev/null +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent/0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch | |||
@@ -0,0 +1,30 @@ | |||
1 | From c9859a38a58996b8767a30e14febc03845f66f95 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Sat, 1 Jul 2017 13:10:53 -0700 | ||
4 | Subject: [PATCH] Define 64bit atomic helpers for ppc 32-bit | ||
5 | |||
6 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
7 | --- | ||
8 | src/atomic64.c | 4 ++-- | ||
9 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
10 | |||
11 | diff --git a/src/atomic64.c b/src/atomic64.c | ||
12 | index f841b39b..35c7c9d8 100644 | ||
13 | --- a/src/atomic64.c | ||
14 | +++ b/src/atomic64.c | ||
15 | @@ -18,10 +18,10 @@ | ||
16 | #include <stdbool.h> | ||
17 | |||
18 | /* | ||
19 | - * only need these on MIPS, since it lacks hardware 64-bit atomics, | ||
20 | + * only need these on MIPS & PPC32, since it lacks hardware 64-bit atomics, | ||
21 | * unlike x86 and ARM. | ||
22 | */ | ||
23 | -#if defined(__mips__) || defined(__mipsel__) | ||
24 | +#if defined(__mips__) || defined(__mipsel__) || defined(__powerpc__) | ||
25 | |||
26 | static void __spin_lock(volatile int *lock) { | ||
27 | while (__sync_lock_test_and_set(lock, 1)) | ||
28 | -- | ||
29 | 2.13.2 | ||
30 | |||
diff --git a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb index 0febebd93..92e65289a 100644 --- a/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb +++ b/meta-oe/recipes-connectivity/libtorrent/libtorrent_git.bb | |||
@@ -9,6 +9,7 @@ DEPENDS = "zlib libsigc++-2.0 openssl cppunit" | |||
9 | SRC_URI = "git://github.com/rakshasa/libtorrent \ | 9 | SRC_URI = "git://github.com/rakshasa/libtorrent \ |
10 | file://don-t-run-code-while-configuring-package.patch \ | 10 | file://don-t-run-code-while-configuring-package.patch \ |
11 | file://0001-implement-64bit-atomic-for-mips.patch \ | 11 | file://0001-implement-64bit-atomic-for-mips.patch \ |
12 | file://0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch \ | ||
12 | " | 13 | " |
13 | SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87" | 14 | SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87" |
14 | 15 | ||