From: Tyler Hall <tylerwhall@gmail.com>
Date: Wed, 28 Oct 2015 00:00:51 +0000 (-0400)
Subject: classes/cpan-base: fix libdir for nativesdk
X-Git-Tag: 2016-4~2288
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=b32420effcc0435353adc63023d2e4276dd1e0c6;p=openembedded-core.git

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>
---

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] = ""