summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorTyler Hall <tylerwhall@gmail.com>2015-10-27 20:00:51 -0400
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-11-24 15:49:26 +0000
commitb32420effcc0435353adc63023d2e4276dd1e0c6 (patch)
tree43b869826fb3edc0270252344da49dfbef7a2aab /meta
parented484c06f436eea62c5d0b1a2964f219f3e5cb61 (diff)
downloadopenembedded-core-b32420effcc0435353adc63023d2e4276dd1e0c6.tar.gz
openembedded-core-b32420effcc0435353adc63023d2e4276dd1e0c6.tar.bz2
openembedded-core-b32420effcc0435353adc63023d2e4276dd1e0c6.zip
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. Signed-off-by: Tyler Hall <tylerwhall@gmail.com> Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
-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 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] = ""