summaryrefslogtreecommitdiffstats
path: root/meta/classes/cpan-base.bbclass
diff options
context:
space:
mode:
authorTyler Hall <tylerwhall@gmail.com>2015-10-28 00:00:51 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-24 15:50:27 (GMT)
commitcf0dfdbcf8be8b8e0a6cb6ebcf0486fa1a89abf6 (patch)
tree55f82ce5d584406519ed4ab49f995944f5a69f7d /meta/classes/cpan-base.bbclass
parenta205c4ce1d420ab2a46e1da62cd96fc4b8564e2e (diff)
downloadpoky-cf0dfdbcf8be8b8e0a6cb6ebcf0486fa1a89abf6.tar.gz
classes/cpan-base: fix libdir for nativesdk
Immediate expansion of perl_get_libdirs() is too early for BBCLASSEXTEND. This results in a packaging QA error when building a cpan recipe as nativesdk. The split debug files do not get picked up by the dbg package because it looks in the wrong libdir. The is_target() function remains because it is used elsewhere. (From OE-Core rev: b32420effcc0435353adc63023d2e4276dd1e0c6) Signed-off-by: Tyler Hall <tylerwhall@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cpan-base.bbclass')
-rw-r--r--meta/classes/cpan-base.bbclass11
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index 7810a4d..a3d08f4 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -29,20 +29,13 @@ def get_perl_version(d):
29 return m.group(1) 29 return m.group(1)
30 return None 30 return None
31 31
32# Determine where the library directories are
33def perl_get_libdirs(d):
34 libdir = d.getVar('libdir', True)
35 if is_target(d) == "no":
36 libdir += '/perl-native'
37 libdir += '/perl'
38 return libdir
39
40def is_target(d): 32def is_target(d):
41 if not bb.data.inherits_class('native', d): 33 if not bb.data.inherits_class('native', d):
42 return "yes" 34 return "yes"
43 return "no" 35 return "no"
44 36
45PERLLIBDIRS := "${@perl_get_libdirs(d)}" 37PERLLIBDIRS = "${libdir}/perl"
38PERLLIBDIRS_class-native = "${libdir}/perl-native"
46PERLVERSION := "${@get_perl_version(d)}" 39PERLVERSION := "${@get_perl_version(d)}"
47PERLVERSION[vardepvalue] = "" 40PERLVERSION[vardepvalue] = ""
48 41