Patchwork Fix ctorrent build failure by using --disable-maintainer-mode option

login
register
mail settings
Submitter philby john
Date Jan. 5, 2012, 12:55 p.m.
Message ID <1325768156.22038.6.camel@localhost.localdomain>
Download mbox | patch
Permalink /patch/18431/
State New, archived
Headers show

Comments

philby john - Jan. 5, 2012, 12:55 p.m.
From: Philby John <pjohn@mvista.com>
Date: Thu, 5 Jan 2012 18:08:00 +0530
Subject: [PATCH] Fix ctorrent build failure by using --disable-maintainer-mode option

ctorrent package fails with error "aclocal.m4:14: error: this file was
generated for autoconf dnh3.3.1" as reported here
lists.linuxtogo.org/pipermail/openembedded-devel/2008-October/006598.html
Fix this by including --disable-maintainer-mode.

Also since ctcs inherits ctorrent.inc add do_configure() there doing
nothing.

Signed-off-by: Philby John <pjohn@mvista.com>
---
 recipes/ctorrent/ctcs_1.4.1.bb     |    6 +++++-
 recipes/ctorrent/ctorrent.inc      |    6 ++++++
 recipes/ctorrent/ctorrent_3.3.1.bb |    2 +-
 3 files changed, 12 insertions(+), 2 deletions(-)
Khem Raj - Jan. 5, 2012, 6:06 p.m.
On Thu, Jan 5, 2012 at 4:55 AM, philby john <pjohn@mvista.com> wrote:
> From: Philby John <pjohn@mvista.com>
> Date: Thu, 5 Jan 2012 18:08:00 +0530
> Subject: [PATCH] Fix ctorrent build failure by using --disable-maintainer-mode option
>
> ctorrent package fails with error "aclocal.m4:14: error: this file was
> generated for autoconf dnh3.3.1" as reported here
> lists.linuxtogo.org/pipermail/openembedded-devel/2008-October/006598.html
> Fix this by including --disable-maintainer-mode.
>
> Also since ctcs inherits ctorrent.inc add do_configure() there doing
> nothing.
>
> Signed-off-by: Philby John <pjohn@mvista.com>
> ---
>  recipes/ctorrent/ctcs_1.4.1.bb     |    6 +++++-
>  recipes/ctorrent/ctorrent.inc      |    6 ++++++
>  recipes/ctorrent/ctorrent_3.3.1.bb |    2 +-
>  3 files changed, 12 insertions(+), 2 deletions(-)
>
> diff --git a/recipes/ctorrent/ctcs_1.4.1.bb b/recipes/ctorrent/ctcs_1.4.1.bb
> index 8680b0c..d1e084e 100644
> --- a/recipes/ctorrent/ctcs_1.4.1.bb
> +++ b/recipes/ctorrent/ctcs_1.4.1.bb
> @@ -5,7 +5,11 @@ RDEPENDS_${PN} = "perl perl-module-strict perl-module-socket perl-module-fcntl \
>             perl-module-errno perl-module-sys-hostname"
>
>  SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctcs-${PV}.tar.gz"
> -PR="r1"
> +PR="r2"
> +
> +do_configure () {
> +        :
> +}
>
>  do_install () {
>   install -d ${D}/usr/bin
> diff --git a/recipes/ctorrent/ctorrent.inc b/recipes/ctorrent/ctorrent.inc
> index 8005fa9..e04c5d3 100644
> --- a/recipes/ctorrent/ctorrent.inc
> +++ b/recipes/ctorrent/ctorrent.inc
> @@ -8,3 +8,9 @@ DEPENDS = "openssl"
>  SRC_URI = "${SOURCEFORGE_MIRROR}/ctorrent/ctorrent-${PV}.tar.bz2"
>
>  inherit autotools
> +
> +EXTRA_OECONF = "--disable-maintainer-mode"
> +
> +do_configure() {
> +                oe_runconf
> +}

why do you override do_configure ?
is it not able to reconfigure ?
Khem Raj - Jan. 5, 2012, 7:35 p.m.
On Thu, Jan 5, 2012 at 10:31 AM, Philby John <pjohn@mvista.com> wrote:
> On 01/05/2012 11:36 PM, Khem Raj wrote:
>> On Thu, Jan 5, 2012 at 4:55 AM, philby john <pjohn@mvista.com> wrote:
>>>
>>>  SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctcs-${PV}.tar.gz"
>>> -PR="r1"
>>> +PR="r2"
>>> +
>>> +do_configure () {
>>> +        :
>>> +}
>>>
>>>  do_install () {
>>>   install -d ${D}/usr/bin
>>> diff --git a/recipes/ctorrent/ctorrent.inc b/recipes/ctorrent/ctorrent.inc
>>> index 8005fa9..e04c5d3 100644
>>> --- a/recipes/ctorrent/ctorrent.inc
>>> +++ b/recipes/ctorrent/ctorrent.inc
>>> @@ -8,3 +8,9 @@ DEPENDS = "openssl"
>>>  SRC_URI = "${SOURCEFORGE_MIRROR}/ctorrent/ctorrent-${PV}.tar.bz2"
>>>
>>>  inherit autotools
>>> +
>>> +EXTRA_OECONF = "--disable-maintainer-mode"
>>> +
>>> +do_configure() {
>>> +                oe_runconf
>>> +}
>>
>> why do you override do_configure ?
>> is it not able to reconfigure ?
>
> Yes, ctcs has nothing to configure with, its just one perl script.
> So do_configure() fails for ctcs.
>

clearly then ctorrent.inc is not that common to be used as such in all
recipes there.
you should move inheriting autotools out of ctorrent.inc
and into the needing .bb

> ~Philby
>
>

Patch

diff --git a/recipes/ctorrent/ctcs_1.4.1.bb b/recipes/ctorrent/ctcs_1.4.1.bb
index 8680b0c..d1e084e 100644
--- a/recipes/ctorrent/ctcs_1.4.1.bb
+++ b/recipes/ctorrent/ctcs_1.4.1.bb
@@ -5,7 +5,11 @@  RDEPENDS_${PN} = "perl perl-module-strict perl-module-socket perl-module-fcntl \
             perl-module-errno perl-module-sys-hostname"
 
 SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctcs-${PV}.tar.gz"
-PR="r1"
+PR="r2"
+
+do_configure () {
+        :
+}
 
 do_install () {
   install -d ${D}/usr/bin
diff --git a/recipes/ctorrent/ctorrent.inc b/recipes/ctorrent/ctorrent.inc
index 8005fa9..e04c5d3 100644
--- a/recipes/ctorrent/ctorrent.inc
+++ b/recipes/ctorrent/ctorrent.inc
@@ -8,3 +8,9 @@  DEPENDS = "openssl"
 SRC_URI = "${SOURCEFORGE_MIRROR}/ctorrent/ctorrent-${PV}.tar.bz2"
 
 inherit autotools
+
+EXTRA_OECONF = "--disable-maintainer-mode"
+
+do_configure() {
+                oe_runconf
+}
diff --git a/recipes/ctorrent/ctorrent_3.3.1.bb b/recipes/ctorrent/ctorrent_3.3.1.bb
index efc2eca..2c6e4f9 100644
--- a/recipes/ctorrent/ctorrent_3.3.1.bb
+++ b/recipes/ctorrent/ctorrent_3.3.1.bb
@@ -6,7 +6,7 @@  SRC_URI = "${SOURCEFORGE_MIRROR}/dtorrent/ctorrent-dnh${PV}.tar.gz \
            file://CVE-2009-1759.patch;striplevel=0 "
 
 S = "${WORKDIR}/${PN}-dnh${PV}"
-PR="r1"
+PR="r2"
 
 SRC_URI[md5sum] = "9bfe42c2dd6a6aabd545fe332bc23e87"
 SRC_URI[sha256sum] = "e65d9c7a4da499314126d979a0a79ce5123e0f969c786bfddcee261f14cb648b"