summaryrefslogtreecommitdiffstats
path: root/meta-oe/recipes-connectivity
diff options
context:
space:
mode:
authorZheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>2019-11-01 17:34:21 +0800
committerKhem Raj <raj.khem@gmail.com>2019-11-01 17:22:53 -0700
commitcc9339f7fb2cc8e01a8d455f322d1e37ea599862 (patch)
treeebca6e14feaf4a1da0ba7410a2fdf692bc2e0019 /meta-oe/recipes-connectivity
parent1dd38149951e8ef2d727ce84ffb404e787534dc9 (diff)
downloadmeta-openembedded-cc9339f7fb2cc8e01a8d455f322d1e37ea599862.tar.gz
rtorrent: upgrade 0.9.7 -> 0.9.8
1) Upgrade rtorrent from 0.9.7 to 0.9.8. 2) Update don-t-run-code-while-configuring-package.patch for new version Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'meta-oe/recipes-connectivity')
-rw-r--r--meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch48
-rw-r--r--meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb6
2 files changed, 32 insertions, 22 deletions
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch b/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch
index 79d4f29fa..7d09f4382 100644
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch
+++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent/don-t-run-code-while-configuring-package.patch
@@ -1,19 +1,26 @@
1Using AC_RUN_IFELSE prevent people from configuring package for 1Using AC_RUN_IFELSE prevent people from configuring package
2cross-compiling. Don't run code while configuring package. 2 for cross-compiling. Don't run code while configuring package.
3 3
4Upstream-Status: Pending 4Upstream-Status: Pending
5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> 5Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
6 6
7Index: libtorrent-0.13.3/scripts/checks.m4 7Update for 0.9.8.
8=================================================================== 8Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
9--- libtorrent-0.13.3.orig/scripts/checks.m4 2012-05-14 14:17:04.000000000 +0300 9---
10+++ libtorrent-0.13.3/scripts/checks.m4 2013-02-10 15:28:37.414445524 +0200 10 scripts/checks.m4 | 34 ----------------------------------
11@@ -95,40 +95,6 @@ 11 scripts/common.m4 | 28 ----------------------------
12 2 files changed, 62 deletions(-)
12 13
14diff --git a/scripts/checks.m4 b/scripts/checks.m4
15index 83be846..1af80f5 100644
16--- a/scripts/checks.m4
17+++ b/scripts/checks.m4
18@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
19
13 AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [ 20 AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
14 AC_MSG_CHECKING(whether kqueue supports pipes and ptys) 21 AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
15- 22-
16- AC_RUN_IFELSE([AC_LANG_SOURCE([ 23- AC_LINK_IFELSE([AC_LANG_SOURCE([
17- #include <fcntl.h> 24- #include <fcntl.h>
18- #include <stdlib.h> 25- #include <stdlib.h>
19- #include <unistd.h> 26- #include <unistd.h>
@@ -47,18 +54,18 @@ Index: libtorrent-0.13.3/scripts/checks.m4
47- AC_MSG_RESULT(no) 54- AC_MSG_RESULT(no)
48- ]) 55- ])
49 ]) 56 ])
50 57
51 AC_DEFUN([TORRENT_WITH_KQUEUE], [ 58 AC_DEFUN([TORRENT_WITH_KQUEUE], [
52Index: libtorrent-0.13.3/scripts/common.m4 59diff --git a/scripts/common.m4 b/scripts/common.m4
53=================================================================== 60index aaf005e..42fb016 100644
54--- libtorrent-0.13.3.orig/scripts/common.m4 2012-05-14 14:17:04.000000000 +0300 61--- a/scripts/common.m4
55+++ libtorrent-0.13.3/scripts/common.m4 2013-02-10 15:27:55.874446741 +0200 62+++ b/scripts/common.m4
56@@ -222,38 +222,10 @@ 63@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system.
57 64
58 AC_DEFUN([TORRENT_CHECK_EXECINFO], [ 65 AC_DEFUN([TORRENT_CHECK_EXECINFO], [
59 AC_MSG_CHECKING(for execinfo.h) 66 AC_MSG_CHECKING(for execinfo.h)
60- 67-
61- AC_RUN_IFELSE([AC_LANG_SOURCE([ 68- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
62- #include <execinfo.h> 69- #include <execinfo.h>
63- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;} 70- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
64- ])], 71- ])],
@@ -69,11 +76,11 @@ Index: libtorrent-0.13.3/scripts/common.m4
69- AC_MSG_RESULT(no) 76- AC_MSG_RESULT(no)
70- ]) 77- ])
71 ]) 78 ])
72 79
73 AC_DEFUN([TORRENT_CHECK_ALIGNED], [ 80 AC_DEFUN([TORRENT_CHECK_ALIGNED], [
74 AC_MSG_CHECKING(the byte alignment) 81 AC_MSG_CHECKING(the byte alignment)
75- 82-
76- AC_RUN_IFELSE([AC_LANG_SOURCE([ 83- AC_LINK_IFELSE([AC_LANG_SOURCE([
77- #include <inttypes.h> 84- #include <inttypes.h>
78- int main() { 85- int main() {
79- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 }; 86- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
@@ -90,5 +97,8 @@ Index: libtorrent-0.13.3/scripts/common.m4
90- AC_MSG_RESULT(required) 97- AC_MSG_RESULT(required)
91- ]) 98- ])
92 ]) 99 ])
93 100
101
102--
1032.7.4
94 104
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
index 9bb81c409..331f978f8 100644
--- a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
+++ b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
@@ -8,10 +8,10 @@ DEPENDS = "libsigc++-2.0 curl cppunit libtorrent ncurses"
8SRC_URI = "git://github.com/rakshasa/rtorrent \ 8SRC_URI = "git://github.com/rakshasa/rtorrent \
9 file://don-t-run-code-while-configuring-package.patch \ 9 file://don-t-run-code-while-configuring-package.patch \
10" 10"
11# v0.9.7 11# v0.9.8
12SRCREV = "327164f9d86aafcd2500a317d485374df32ea622" 12SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947"
13 13
14PV = "0.9.7+git${SRCPV}" 14PV = "0.9.8"
15 15
16S = "${WORKDIR}/git" 16S = "${WORKDIR}/git"
17 17