Patchwork [CONSOLIDATED,PULL,14/20] Make intltool use perlnative instead of perl on host

login
register
mail settings
Submitter Saul Wold
Date July 21, 2011, 7:53 a.m.
Message ID <fc7ecf3f3b90f6949e790f18eeea908d069282d5.1311234475.git.sgw@linux.intel.com>
Download mbox | patch
Permalink /patch/8165/
State New, archived
Headers show

Comments

Saul Wold - July 21, 2011, 7:53 a.m.
From: Matthew McClintock <msm@freescale.com>

intltool recipe was using perl from the host instead of perl from
poky. This forces the recipe to use poky's perl (along with perl
modules it pulls in)

Signed-off-by: Matthew McClintock <msm@freescale.com>
Signed-off-by: Tom Rini <tom_rini@mentor.com>
---
 meta/recipes-devtools/intltool/intltool.inc       |    2 +-
 meta/recipes-devtools/intltool/intltool_0.40.6.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Khem Raj - July 21, 2011, 6:47 p.m.
On Thu, Jul 21, 2011 at 12:53 AM, Saul Wold <sgw@linux.intel.com> wrote:
>
> -inherit autotools pkgconfig
> +inherit autotools pkgconfig perlnative
>
>  export PERL_virtclass-native = "/usr/bin/env perl"

is the above line still needed


>  BBCLASSEXTEND = "native"
>
Tom Rini - July 21, 2011, 6:57 p.m.
On 07/21/2011 11:47 AM, Khem Raj wrote:
> On Thu, Jul 21, 2011 at 12:53 AM, Saul Wold <sgw@linux.intel.com> wrote:
>>
>> -inherit autotools pkgconfig
>> +inherit autotools pkgconfig perlnative
>>
>>  export PERL_virtclass-native = "/usr/bin/env perl"
> 
> is the above line still needed

It's actively wrong now and needs to be /usr/bin/env nativeperl (which
is a wrapper script to get to perl-native/perl).
Richard Purdie - July 21, 2011, 8:43 p.m.
On Thu, 2011-07-21 at 11:57 -0700, Tom Rini wrote:
> On 07/21/2011 11:47 AM, Khem Raj wrote:
> > On Thu, Jul 21, 2011 at 12:53 AM, Saul Wold <sgw@linux.intel.com> wrote:
> >>
> >> -inherit autotools pkgconfig
> >> +inherit autotools pkgconfig perlnative
> >>
> >>  export PERL_virtclass-native = "/usr/bin/env perl"
> > 
> > is the above line still needed
> 
> It's actively wrong now and needs to be /usr/bin/env nativeperl (which
> is a wrapper script to get to perl-native/perl).

Patch please :)

Cheers,

Richard

Patch

diff --git a/meta/recipes-devtools/intltool/intltool.inc b/meta/recipes-devtools/intltool/intltool.inc
index a4bccd3..c934654 100644
--- a/meta/recipes-devtools/intltool/intltool.inc
+++ b/meta/recipes-devtools/intltool/intltool.inc
@@ -10,7 +10,7 @@  DEPENDS = "libxml-parser-perl-native"
 #RDEPENDS_${PN} = "libxml-parser-perl"
 RRECOMMENDS_${PN} = "perl-modules"
 
-inherit autotools pkgconfig
+inherit autotools pkgconfig perlnative
 
 export PERL_virtclass-native = "/usr/bin/env perl"
 BBCLASSEXTEND = "native"
diff --git a/meta/recipes-devtools/intltool/intltool_0.40.6.bb b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
index ea67144..c7938e5 100644
--- a/meta/recipes-devtools/intltool/intltool_0.40.6.bb
+++ b/meta/recipes-devtools/intltool/intltool_0.40.6.bb
@@ -1,7 +1,7 @@ 
 require intltool.inc
 LICENSE="GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f"
-PR = "r2"
+PR = "r3"
 
 SRC_URI_append = " file://intltool-nowarn-0.40.0.patch"