Patchwork classes/cpan-base: fix signatures changing when perl is in sysroot

login
register
mail settings
Submitter Paul Eggleton
Date Feb. 11, 2014, 6 p.m.
Message ID <1392141615-31963-1-git-send-email-paul.eggleton@linux.intel.com>
Download mbox | patch
Permalink /patch/66599/
State Accepted
Commit 2d05f5763cd6032d710cf213c3725447bc8090f3
Headers show

Comments

Paul Eggleton - Feb. 11, 2014, 6 p.m.
The previous fix for this same issue (OE-Core rev
f31f6a70ec24e8c9515d69c5092e15effc5e7d4d) was not sufficient - we are
setting the PERLVERSION variable from the get_perl_version function, but
we're setting it using immediate expansion; thus the value is going into
the signature and is still different between the time the recipe is
cached on an empty TMPDIR and after perl is in the sysroot and we run
bitbake -S perf. We could remove the immediate expansion, but that would
mean the get_perl_version function would be called more often, so just set
vardepvalue on the PERLVERSION variable to fix the problem instead.

Signed-off-by: Paul Eggleton <paul.eggleton@linux.intel.com>
---
 meta/classes/cpan-base.bbclass | 1 +
 1 file changed, 1 insertion(+)

Patch

diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index aa502d5..d9817ba 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -44,6 +44,7 @@  def is_target(d):
 
 PERLLIBDIRS := "${@perl_get_libdirs(d)}"
 PERLVERSION := "${@get_perl_version(d)}"
+PERLVERSION[vardepvalue] = ""
 
 FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \
                     ${PERLLIBDIRS}/auto/*/*/.debug \