[PULL v2 0/1] fix perl sstate issue

[PULL v2 0/1] fix perl sstate issue

[Saul Wold]

This fixes a problem where a sstate build will be using perl.real
directly instead of perl.

Sau!

The following changes since commit cb8efc0e1ec00892b46325aabfb1b4020a46c078:

  linux-yocto: re-enable utrace (2011-09-07 14:53:38 +0100)

are available in the git repository at:
  git://git.openembedded.org/openembedded-core-contrib sgw/fix2
  http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=sgw/fix2

Saul Wold (1):
  cpan.bbclass: fix native perl issue

 meta/classes/cpan.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

-- 
1.7.6

[PULL v2 1/1] cpan.bbclass: fix native perl issue

[Saul Wold]

When configuring cpan packages, the directories passed to MakeMaker
are the target directories. There was a patch that was applied to the
native perl to find perl.real and convert that to perl.  This does not
apply for the target perl modules and therefore MakeMaker finds perl.real.

This patch to cpan configure modifies the Makefile after configure and
changes the perl.real to just straight perl so we have the correct paths
and shared state info in usable.

Signed-off-by: Saul Wold <sgw@linux.intel.com>
---
 meta/classes/cpan.bbclass |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index cb1c2f4..587e688 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -24,7 +24,8 @@ cpan_do_configure () {
 		for f in `find -name Makefile.PL`; do
 			f2=`echo $f | sed -e 's/.PL//'`
 			sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \
-			$f2
+				-e 's/perl.real/perl/' \
+				$f2
 		done
 	fi
 }
-- 
1.7.6

Re: [PULL v2 1/1] cpan.bbclass: fix native perl issue

[Richard Purdie]

On Wed, 2011-09-07 at 09:12 -0700, Saul Wold wrote:
> When configuring cpan packages, the directories passed to MakeMaker
> are the target directories. There was a patch that was applied to the
> native perl to find perl.real and convert that to perl.  This does not
> apply for the target perl modules and therefore MakeMaker finds perl.real.
> 
> This patch to cpan configure modifies the Makefile after configure and
> changes the perl.real to just straight perl so we have the correct paths
> and shared state info in usable.
> 
> Signed-off-by: Saul Wold <sgw@linux.intel.com>
> ---
>  meta/classes/cpan.bbclass |    3 ++-
>  1 files changed, 2 insertions(+), 1 deletions(-)

Merged to master, thanks.

Richard