Patchwork [v2] intltool: include intltool.m4 and add missing rdepends

login
register
mail settings
Submitter Constantin Musca
Date Sept. 19, 2012, 9:59 a.m.
Message ID <1348048754-30379-1-git-send-email-constantinx.musca@intel.com>
Download mbox | patch
Permalink /patch/36903/
State Accepted
Commit f5f3d3fb14e983af114afc6425dc339053927f25
Headers show

Comments

Constantin Musca - Sept. 19, 2012, 9:59 a.m.
- include /usr/share/aclocal/intltool.m4 into the intltool
package (the files from intltool-dev must be included into the
main package, as intltool is a development tool)
- add missing rdepends: gettext-dev, libxml-parser-perl

[YOCTO #2597]

Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
---
 meta/recipes-devtools/intltool/intltool.inc       |    9 ++++++++-
 meta/recipes-devtools/intltool/intltool_0.50.0.bb |    2 +-
 2 files changed, 9 insertions(+), 2 deletions(-)
Constantin Musca - Sept. 19, 2012, 1:04 p.m.
On 09/19/2012 04:23 PM, Khem Raj wrote:
>> >--- a/meta/recipes-devtools/intltool/intltool.inc
>> >+++ b/meta/recipes-devtools/intltool/intltool.inc
>> >@@ -7,11 +7,18 @@ SRC_URI ="http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
>> >  S = "${WORKDIR}/intltool-${PV}"
>> >
>> >  DEPENDS = "libxml-parser-perl-native"
>> >+RDEPENDS_${PN} = "gettext-dev libxml-parser-perl"
> creating a runtime dependency on a dev package seems troublesome to me.
> Can you explain why is this being done ?
>
>> >  DEPENDS_virtclass-native = "libxml-parser-perl-native"
>> >-#RDEPENDS_${PN} = "libxml-parser-perl"
>> >+# gettext is assumed to exist on the host
>> >+RDEPENDS_${PN}_virtclass-native = "libxml-parser-perl-native"
>> >  RRECOMMENDS_${PN} = "perl-modules"
Ross suggested to use these RDEPENDS after having issues with some 
packages on a image due to intltool.

Constantin
Khem Raj - Sept. 19, 2012, 1:23 p.m.
On Wed, Sep 19, 2012 at 2:59 AM, Constantin Musca
<constantinx.musca@intel.com> wrote:
> - include /usr/share/aclocal/intltool.m4 into the intltool
> package (the files from intltool-dev must be included into the
> main package, as intltool is a development tool)
> - add missing rdepends: gettext-dev, libxml-parser-perl
>
> [YOCTO #2597]
>
> Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> ---
>  meta/recipes-devtools/intltool/intltool.inc       |    9 ++++++++-
>  meta/recipes-devtools/intltool/intltool_0.50.0.bb |    2 +-
>  2 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
> index 1c41f0f..59974d8 100644
> --- a/meta/recipes-devtools/intltool/intltool.inc
> +++ b/meta/recipes-devtools/intltool/intltool.inc
> @@ -7,11 +7,18 @@ SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
>  S = "${WORKDIR}/intltool-${PV}"
>
>  DEPENDS = "libxml-parser-perl-native"
> +RDEPENDS_${PN} = "gettext-dev libxml-parser-perl"

creating a runtime dependency on a dev package seems troublesome to me.
Can you explain why is this being done ?

>  DEPENDS_virtclass-native = "libxml-parser-perl-native"
> -#RDEPENDS_${PN} = "libxml-parser-perl"
> +# gettext is assumed to exist on the host
> +RDEPENDS_${PN}_virtclass-native = "libxml-parser-perl-native"
>  RRECOMMENDS_${PN} = "perl-modules"
>  RRECOMMENDS_${PN}_virtclass-native = ""
>
> +FILES_${PN}-dev = ""
> +FILES_${PN} += "${datadir}/aclocal"
> +
> +INSANE_SKIP_${PN} += "dev-deps"
> +
>  inherit autotools pkgconfig perlnative
>
>  export PERL = "${bindir}/env perl"
> diff --git a/meta/recipes-devtools/intltool/intltool_0.50.0.bb b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
> index d1ee31d..fa9850f 100644
> --- a/meta/recipes-devtools/intltool/intltool_0.50.0.bb
> +++ b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
> @@ -1,7 +1,7 @@
>  require intltool.inc
>  LICENSE="GPLv2"
>  LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
> -PR = "r0"
> +PR = "r1"
>
>  SRC_URI += "file://intltool-nowarn-0.50.0.patch \
>             ${NATIVEPATCHES} \
> --
> 1.7.9.5
>
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
Constantin Musca - Sept. 19, 2012, 2:33 p.m.
On 09/19/2012 06:15 PM, Burton, Ross wrote:
> On 19 September 2012 16:09, Saul Wold <sgw@linux.intel.com> wrote:
>> The question here is why do we need the gettext-dev package for intltool?
>> What does intltool need from the -dev package?
> intltool needs the gettext binaries and IIRC a header - but I'm
> sufficiently unsure about the details that someone should verify what
> the dependencies were for documenting in the commit.
>
> Ross
I'm going to investigate this and come back to you.

Constantin
Saul Wold - Sept. 19, 2012, 3:09 p.m.
On 09/19/2012 06:04 AM, Constantin Musca wrote:
> On 09/19/2012 04:23 PM, Khem Raj wrote:
>>> >--- a/meta/recipes-devtools/intltool/intltool.inc
>>> >+++ b/meta/recipes-devtools/intltool/intltool.inc
>>> >@@ -7,11 +7,18 @@ SRC_URI
>>> ="http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
>>> >  S = "${WORKDIR}/intltool-${PV}"
>>> >
>>> >  DEPENDS = "libxml-parser-perl-native"
>>> >+RDEPENDS_${PN} = "gettext-dev libxml-parser-perl"
>> creating a runtime dependency on a dev package seems troublesome to me.
>> Can you explain why is this being done ?
>>
The question here is why do we need the gettext-dev package for 
intltool?  What does intltool need from the -dev package?

Sau!

>>> >  DEPENDS_virtclass-native = "libxml-parser-perl-native"
>>> >-#RDEPENDS_${PN} = "libxml-parser-perl"
>>> >+# gettext is assumed to exist on the host
>>> >+RDEPENDS_${PN}_virtclass-native = "libxml-parser-perl-native"
>>> >  RRECOMMENDS_${PN} = "perl-modules"
> Ross suggested to use these RDEPENDS after having issues with some
> packages on a image due to intltool.
>
> Constantin
>
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-core
>
Ross Burton - Sept. 19, 2012, 3:10 p.m.
On 19 September 2012 14:04, Constantin Musca
<constantinx.musca@intel.com> wrote:
> Ross suggested to use these RDEPENDS after having issues with some packages
> on a image due to intltool.

I knew I should have put the exact errors in the bug...

I'm not in the position to replicate this right now (at a conference)
but if someone boots a yocto sdk image and tries to compile something
that uses intltool, you'll discover the problems.  If no-one can do
this before Friday I can do that myself then.

Ross
Ross Burton - Sept. 19, 2012, 3:15 p.m.
On 19 September 2012 16:09, Saul Wold <sgw@linux.intel.com> wrote:
> The question here is why do we need the gettext-dev package for intltool?
> What does intltool need from the -dev package?

intltool needs the gettext binaries and IIRC a header - but I'm
sufficiently unsure about the details that someone should verify what
the dependencies were for documenting in the commit.

Ross
Richard Purdie - Sept. 20, 2012, 1:34 p.m.
On Wed, 2012-09-19 at 06:23 -0700, Khem Raj wrote:
> On Wed, Sep 19, 2012 at 2:59 AM, Constantin Musca
> <constantinx.musca@intel.com> wrote:
> > - include /usr/share/aclocal/intltool.m4 into the intltool
> > package (the files from intltool-dev must be included into the
> > main package, as intltool is a development tool)
> > - add missing rdepends: gettext-dev, libxml-parser-perl
> >
> > [YOCTO #2597]
> >
> > Signed-off-by: Constantin Musca <constantinx.musca@intel.com>
> > ---
> >  meta/recipes-devtools/intltool/intltool.inc       |    9 ++++++++-
> >  meta/recipes-devtools/intltool/intltool_0.50.0.bb |    2 +-
> >  2 files changed, 9 insertions(+), 2 deletions(-)
> >
> > diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
> > index 1c41f0f..59974d8 100644
> > --- a/meta/recipes-devtools/intltool/intltool.inc
> > +++ b/meta/recipes-devtools/intltool/intltool.inc
> > @@ -7,11 +7,18 @@ SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
> >  S = "${WORKDIR}/intltool-${PV}"
> >
> >  DEPENDS = "libxml-parser-perl-native"
> > +RDEPENDS_${PN} = "gettext-dev libxml-parser-perl"
> 
> creating a runtime dependency on a dev package seems troublesome to me.
> Can you explain why is this being done ?

Constantin has posted an update about this. The issue is the intltool.m4
macros references macros that come from gettext-dev.

I think that whilst this unusual, developer tools can need other
development tools. We need to remember that intltool is only ever used
for development.

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index 1c41f0f..59974d8 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -7,11 +7,18 @@  SRC_URI = "http://launchpad.net/${BPN}/trunk/${PV}/+download/${BP}.tar.gz"
 S = "${WORKDIR}/intltool-${PV}"
 
 DEPENDS = "libxml-parser-perl-native"
+RDEPENDS_${PN} = "gettext-dev libxml-parser-perl"
 DEPENDS_virtclass-native = "libxml-parser-perl-native"
-#RDEPENDS_${PN} = "libxml-parser-perl"
+# gettext is assumed to exist on the host
+RDEPENDS_${PN}_virtclass-native = "libxml-parser-perl-native"
 RRECOMMENDS_${PN} = "perl-modules"
 RRECOMMENDS_${PN}_virtclass-native = ""
 
+FILES_${PN}-dev = ""
+FILES_${PN} += "${datadir}/aclocal"
+
+INSANE_SKIP_${PN} += "dev-deps"
+
 inherit autotools pkgconfig perlnative
 
 export PERL = "${bindir}/env perl"
diff --git a/meta/recipes-devtools/intltool/intltool_0.50.0.bb b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
index d1ee31d..fa9850f 100644
--- a/meta/recipes-devtools/intltool/intltool_0.50.0.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.50.0.bb
@@ -1,7 +1,7 @@ 
 require intltool.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r0"
+PR = "r1"
 
 SRC_URI += "file://intltool-nowarn-0.50.0.patch \
            ${NATIVEPATCHES} \