mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-12-16 15:25:53 +01:00
libtorrent: Upgrade to latest 0.13.7+master
* Fixes build with OpenSSL 1.1.x * Adjust patches to rebase on top of current master Signed-off-by: Khem Raj <raj.khem@gmail.com>
This commit is contained in:
parent
764eb5d9f8
commit
c829442cf9
|
|
@ -4,91 +4,25 @@ cross-compiling. Don't run code while configuring package.
|
||||||
Upstream-Status: Pending
|
Upstream-Status: Pending
|
||||||
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
|
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
|
||||||
|
|
||||||
Index: libtorrent-0.13.3/scripts/checks.m4
|
Index: git/scripts/common.m4
|
||||||
===================================================================
|
===================================================================
|
||||||
--- libtorrent-0.13.3.orig/scripts/checks.m4 2012-05-14 14:17:04.000000000 +0300
|
--- git.orig/scripts/common.m4
|
||||||
+++ libtorrent-0.13.3/scripts/checks.m4 2013-02-10 15:28:37.414445524 +0200
|
+++ git/scripts/common.m4
|
||||||
@@ -95,40 +95,6 @@
|
@@ -153,7 +153,7 @@ dnl Need to fix this so that it uses t
|
||||||
|
|
||||||
AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
|
|
||||||
AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
|
|
||||||
-
|
|
||||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
|
||||||
- #include <fcntl.h>
|
|
||||||
- #include <stdlib.h>
|
|
||||||
- #include <unistd.h>
|
|
||||||
- #include <sys/event.h>
|
|
||||||
- #include <sys/time.h>
|
|
||||||
- int main() {
|
|
||||||
- struct kevent ev@<:@2@:>@, ev_out@<:@2@:>@;
|
|
||||||
- struct timespec ts = { 0, 0 };
|
|
||||||
- int pfd@<:@2@:>@, pty@<:@2@:>@, kfd, n;
|
|
||||||
- char buffer@<:@9001@:>@;
|
|
||||||
- if (pipe(pfd) == -1) return 1;
|
|
||||||
- if (fcntl(pfd@<:@1@:>@, F_SETFL, O_NONBLOCK) == -1) return 2;
|
|
||||||
- while ((n = write(pfd@<:@1@:>@, buffer, sizeof(buffer))) == sizeof(buffer));
|
|
||||||
- if ((pty@<:@0@:>@=posix_openpt(O_RDWR | O_NOCTTY)) == -1) return 3;
|
|
||||||
- if ((pty@<:@1@:>@=grantpt(pty@<:@0@:>@)) == -1) return 4;
|
|
||||||
- EV_SET(ev+0, pfd@<:@1@:>@, EVFILT_WRITE, EV_ADD | EV_ENABLE, 0, 0, NULL);
|
|
||||||
- EV_SET(ev+1, pty@<:@1@:>@, EVFILT_READ, EV_ADD | EV_ENABLE, 0, 0, NULL);
|
|
||||||
- if ((kfd = kqueue()) == -1) return 5;
|
|
||||||
- if ((n = kevent(kfd, ev, 2, NULL, 0, NULL)) == -1) return 6;
|
|
||||||
- if (ev_out@<:@0@:>@.flags & EV_ERROR) return 7;
|
|
||||||
- if (ev_out@<:@1@:>@.flags & EV_ERROR) return 8;
|
|
||||||
- read(pfd@<:@0@:>@, buffer, sizeof(buffer));
|
|
||||||
- if ((n = kevent(kfd, NULL, 0, ev_out, 2, &ts)) < 1) return 9;
|
|
||||||
- return 0;
|
|
||||||
- }
|
|
||||||
- ])],
|
|
||||||
- [
|
|
||||||
- AC_MSG_RESULT(yes)
|
|
||||||
- ], [
|
|
||||||
- AC_DEFINE(KQUEUE_SOCKET_ONLY, 1, kqueue only supports sockets.)
|
|
||||||
- AC_MSG_RESULT(no)
|
|
||||||
- ])
|
|
||||||
])
|
|
||||||
|
|
||||||
AC_DEFUN([TORRENT_WITH_KQUEUE], [
|
|
||||||
Index: libtorrent-0.13.3/scripts/common.m4
|
|
||||||
===================================================================
|
|
||||||
--- libtorrent-0.13.3.orig/scripts/common.m4 2012-05-14 14:17:04.000000000 +0300
|
|
||||||
+++ libtorrent-0.13.3/scripts/common.m4 2013-02-10 15:27:55.874446741 +0200
|
|
||||||
@@ -222,38 +222,10 @@
|
|
||||||
|
|
||||||
AC_DEFUN([TORRENT_CHECK_EXECINFO], [
|
AC_DEFUN([TORRENT_CHECK_EXECINFO], [
|
||||||
AC_MSG_CHECKING(for execinfo.h)
|
AC_MSG_CHECKING(for execinfo.h)
|
||||||
-
|
|
||||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
|
||||||
- #include <execinfo.h>
|
|
||||||
- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
|
|
||||||
- ])],
|
|
||||||
- [
|
|
||||||
- AC_MSG_RESULT(yes)
|
|
||||||
- AC_DEFINE(USE_EXECINFO, 1, Use execinfo.h)
|
|
||||||
- ], [
|
|
||||||
- AC_MSG_RESULT(no)
|
|
||||||
- ])
|
|
||||||
])
|
|
||||||
|
|
||||||
|
- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
|
||||||
|
+ AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||||
|
#include <execinfo.h>
|
||||||
|
int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
|
||||||
|
])],
|
||||||
|
@@ -168,7 +168,7 @@ AC_DEFUN([TORRENT_CHECK_EXECINFO], [
|
||||||
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
|
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
|
||||||
AC_MSG_CHECKING(the byte alignment)
|
AC_MSG_CHECKING(the byte alignment)
|
||||||
-
|
|
||||||
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
- AC_RUN_IFELSE([AC_LANG_SOURCE([
|
||||||
- #include <inttypes.h>
|
+ AC_LINK_IFELSE([AC_LANG_SOURCE([
|
||||||
- int main() {
|
#include <inttypes.h>
|
||||||
- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
|
int main() {
|
||||||
- int i;
|
char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
|
||||||
- for (i = 1; i < 4; ++i)
|
|
||||||
- if (*(uint32_t*)(buf + i) == 0) return -1;
|
|
||||||
- return 0;
|
|
||||||
- }
|
|
||||||
- ])],
|
|
||||||
- [
|
|
||||||
- AC_MSG_RESULT(none needed)
|
|
||||||
- ], [
|
|
||||||
- AC_DEFINE(USE_ALIGNED, 1, Require byte alignment)
|
|
||||||
- AC_MSG_RESULT(required)
|
|
||||||
- ])
|
|
||||||
])
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -11,9 +11,9 @@ SRC_URI = "git://github.com/rakshasa/libtorrent \
|
||||||
file://0001-implement-64bit-atomic-for-mips.patch \
|
file://0001-implement-64bit-atomic-for-mips.patch \
|
||||||
file://0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch \
|
file://0001-Define-64bit-atomic-helpers-for-ppc-32-bit.patch \
|
||||||
"
|
"
|
||||||
SRCREV = "c167c5a9e0bcf0df23ae5efd91396aae0e37eb87"
|
SRCREV = "074f6ec51a2e4bc5c6140b4dad13c9bb56f3f0dc"
|
||||||
|
|
||||||
PV = "0.13.6+git${SRCPV}"
|
PV = "0.13.7+git${SRCPV}"
|
||||||
|
|
||||||
S = "${WORKDIR}/git"
|
S = "${WORKDIR}/git"
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user