mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-05-30 00:20:08 +00:00
Code Issues Projects Releases Wiki Activity

cpan.bbclass, cpan-base.bbclas: update them for the perlnative change

Browse Source 
Since perl-native now populates into its own dir, here we need
change accordingly.

Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
This commit is contained in:
Dexuan Cui
2011-05-31 15:16:29 +08:00
committed by Richard Purdie
parent 38d0c607d8
commit c13b10a6ae
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
meta/classes/cpan-base.bbclass
+7 -3
View File
@@ -7,10 +7,12 @@ FILES_${PN} += "${libdir}/perl ${datadir}/perl"
DEPENDS += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}"
RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}"
PERL_OWN_DIR = "${@["", "/perl-native"][(bb.data.inherits_class('native', d))]}"
# Determine the staged version of perl from the perl configuration file
def get_perl_version(d):
import re
cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d)
cfg = bb.data.expand('${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh', d)
try:
f = open(cfg, 'r')
except IOError:
@@ -27,8 +29,10 @@ def get_perl_version(d):
# Determine where the library directories are
def perl_get_libdirs(d):
libdir = bb.data.getVar('libdir', d, 1)
libdirs = libdir + '/perl'
return libdirs
if is_target(d) == "no":
libdir += '/perl-native'
libdir += '/perl'
return libdir
def is_target(d):
if not bb.data.inherits_class('native', d):