From cf0dfdbcf8be8b8e0a6cb6ebcf0486fa1a89abf6 Mon Sep 17 00:00:00 2001 From: Tyler Hall Date: Tue, 27 Oct 2015 20:00:51 -0400 Subject: 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 Signed-off-by: Ross Burton Signed-off-by: Richard Purdie --- meta/classes/cpan-base.bbclass | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 7810a4dc61..a3d08f4a90 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass @@ -29,20 +29,13 @@ def get_perl_version(d): return m.group(1) return None -# Determine where the library directories are -def perl_get_libdirs(d): - libdir = d.getVar('libdir', True) - if is_target(d) == "no": - libdir += '/perl-native' - libdir += '/perl' - return libdir - def is_target(d): if not bb.data.inherits_class('native', d): return "yes" return "no" -PERLLIBDIRS := "${@perl_get_libdirs(d)}" +PERLLIBDIRS = "${libdir}/perl" +PERLLIBDIRS_class-native = "${libdir}/perl-native" PERLVERSION := "${@get_perl_version(d)}" PERLVERSION[vardepvalue] = "" -- cgit v1.2.3-54-g00ecf