* [meta-oe][PATCH] rtorrent: upgrade 0.9.7 -> 0.9.8
@ 2019-11-01 9:34 Zheng Ruoqin
2019-11-01 20:47 ` Adrian Bunk
0 siblings, 1 reply; 3+ messages in thread
From: Zheng Ruoqin @ 2019-11-01 9:34 UTC (permalink / raw)
To: openembedded-devel
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>
---
.../don-t-run-code-while-configuring-package.patch | 48 +++++++++++++---------
.../recipes-connectivity/rtorrent/rtorrent_git.bb | 6 +--
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 79d4f29..7d09f43 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 @@
-Using AC_RUN_IFELSE prevent people from configuring package for
-cross-compiling. Don't run code while configuring package.
+Using AC_RUN_IFELSE prevent people from configuring package
+ for cross-compiling. Don't run code while configuring package.
Upstream-Status: Pending
Signed-off-by: Andrei Gherzan <andrei@gherzan.ro>
-Index: libtorrent-0.13.3/scripts/checks.m4
-===================================================================
---- libtorrent-0.13.3.orig/scripts/checks.m4 2012-05-14 14:17:04.000000000 +0300
-+++ libtorrent-0.13.3/scripts/checks.m4 2013-02-10 15:28:37.414445524 +0200
-@@ -95,40 +95,6 @@
+Update for 0.9.8.
+Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com>
+---
+ scripts/checks.m4 | 34 ----------------------------------
+ scripts/common.m4 | 28 ----------------------------
+ 2 files changed, 62 deletions(-)
+diff --git a/scripts/checks.m4 b/scripts/checks.m4
+index 83be846..1af80f5 100644
+--- a/scripts/checks.m4
++++ b/scripts/checks.m4
+@@ -95,40 +95,6 @@ AC_DEFUN([TORRENT_CHECK_KQUEUE], [
+
AC_DEFUN([TORRENT_CHECK_KQUEUE_SOCKET_ONLY], [
AC_MSG_CHECKING(whether kqueue supports pipes and ptys)
-
-- AC_RUN_IFELSE([AC_LANG_SOURCE([
+- AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <fcntl.h>
- #include <stdlib.h>
- #include <unistd.h>
@@ -47,18 +54,18 @@ Index: libtorrent-0.13.3/scripts/checks.m4
- 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 @@
-
+diff --git a/scripts/common.m4 b/scripts/common.m4
+index aaf005e..42fb016 100644
+--- a/scripts/common.m4
++++ b/scripts/common.m4
+@@ -152,38 +152,10 @@ dnl Need to fix this so that it uses the stuff defined by the system.
+
AC_DEFUN([TORRENT_CHECK_EXECINFO], [
AC_MSG_CHECKING(for execinfo.h)
-
-- AC_RUN_IFELSE([AC_LANG_SOURCE([
+- AC_COMPILE_IFELSE([AC_LANG_SOURCE([
- #include <execinfo.h>
- int main() { backtrace((void**)0, 0); backtrace_symbols((char**)0, 0); return 0;}
- ])],
@@ -69,11 +76,11 @@ Index: libtorrent-0.13.3/scripts/common.m4
- AC_MSG_RESULT(no)
- ])
])
-
+
AC_DEFUN([TORRENT_CHECK_ALIGNED], [
AC_MSG_CHECKING(the byte alignment)
-
-- AC_RUN_IFELSE([AC_LANG_SOURCE([
+- AC_LINK_IFELSE([AC_LANG_SOURCE([
- #include <inttypes.h>
- int main() {
- char buf@<:@8@:>@ = { 0, 0, 0, 0, 1, 0, 0, 0 };
@@ -90,5 +97,8 @@ Index: libtorrent-0.13.3/scripts/common.m4
- AC_MSG_RESULT(required)
- ])
])
-
+
+
+--
+2.7.4
diff --git a/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb b/meta-oe/recipes-connectivity/rtorrent/rtorrent_git.bb
index 9bb81c4..6f0e8c1 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"
SRC_URI = "git://github.com/rakshasa/rtorrent \
file://don-t-run-code-while-configuring-package.patch \
"
-# v0.9.7
-SRCREV = "327164f9d86aafcd2500a317d485374df32ea622"
+# v0.9.8
+SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947"
-PV = "0.9.7+git${SRCPV}"
+PV = "0.9.8+git${SRCPV}"
S = "${WORKDIR}/git"
--
2.7.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [meta-oe][PATCH] rtorrent: upgrade 0.9.7 -> 0.9.8
2019-11-01 9:34 [meta-oe][PATCH] rtorrent: upgrade 0.9.7 -> 0.9.8 Zheng Ruoqin
@ 2019-11-01 20:47 ` Adrian Bunk
2019-11-01 21:18 ` Khem Raj
0 siblings, 1 reply; 3+ messages in thread
From: Adrian Bunk @ 2019-11-01 20:47 UTC (permalink / raw)
To: Zheng Ruoqin; +Cc: openembedded-devel
On Fri, Nov 01, 2019 at 05:34:21PM +0800, Zheng Ruoqin wrote:
>...
> index 9bb81c4..6f0e8c1 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"
> SRC_URI = "git://github.com/rakshasa/rtorrent \
> file://don-t-run-code-while-configuring-package.patch \
> "
> -# v0.9.7
> -SRCREV = "327164f9d86aafcd2500a317d485374df32ea622"
> +# v0.9.8
> +SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947"
>
> -PV = "0.9.7+git${SRCPV}"
> +PV = "0.9.8+git${SRCPV}"
>...
This is exactly the 0.9.8 release, please change to
PV = "0.9.8"
cu
Adrian
--
"Is there not promise of rain?" Ling Tan asked suddenly out
of the darkness. There had been need of rain for many days.
"Only a promise," Lao Er said.
Pearl S. Buck - Dragon Seed
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [meta-oe][PATCH] rtorrent: upgrade 0.9.7 -> 0.9.8
2019-11-01 20:47 ` Adrian Bunk
@ 2019-11-01 21:18 ` Khem Raj
0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2019-11-01 21:18 UTC (permalink / raw)
To: Adrian Bunk; +Cc: openembeded-devel
On Fri, Nov 1, 2019 at 1:48 PM Adrian Bunk <bunk@stusta.de> wrote:
>
> On Fri, Nov 01, 2019 at 05:34:21PM +0800, Zheng Ruoqin wrote:
> >...
> > index 9bb81c4..6f0e8c1 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"
> > SRC_URI = "git://github.com/rakshasa/rtorrent \
> > file://don-t-run-code-while-configuring-package.patch \
> > "
> > -# v0.9.7
> > -SRCREV = "327164f9d86aafcd2500a317d485374df32ea622"
> > +# v0.9.8
> > +SRCREV = "6154d1698756e0c4842b1c13a0e56db93f1aa947"
> >
> > -PV = "0.9.7+git${SRCPV}"
> > +PV = "0.9.8+git${SRCPV}"
> >...
>
> This is exactly the 0.9.8 release, please change to
> PV = "0.9.8"
>
I have already tweaked this patch in master-next
>
> cu
> Adrian
>
> --
>
> "Is there not promise of rain?" Ling Tan asked suddenly out
> of the darkness. There had been need of rain for many days.
> "Only a promise," Lao Er said.
> Pearl S. Buck - Dragon Seed
>
> --
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-devel
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2019-11-01 21:19 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-11-01 9:34 [meta-oe][PATCH] rtorrent: upgrade 0.9.7 -> 0.9.8 Zheng Ruoqin
2019-11-01 20:47 ` Adrian Bunk
2019-11-01 21:18 ` Khem Raj
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.