diff options
| author | Dexuan Cui <dexuan.cui@intel.com> | 2011-05-31 15:16:29 +0800 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-14 14:37:28 +0100 |
| commit | fc7324626555d714795eba456227828374479b44 (patch) | |
| tree | 90b666d8b220b3c84444ec9be019d251edf1c360 /meta/classes/cpan-base.bbclass | |
| parent | 447c56a3a312e103696c8342f5da023b51f6805a (diff) | |
| download | openembedded-core-fc7324626555d714795eba456227828374479b44.tar.gz openembedded-core-fc7324626555d714795eba456227828374479b44.tar.bz2 openembedded-core-fc7324626555d714795eba456227828374479b44.zip | |
cpan.bbclass, cpan-base.bbclas: update them for the perlnative change
Since perl-native now populates into its own dir, here we need
change accordingly.
Signed-off-by: Dexuan Cui <dexuan.cui@intel.com>
Diffstat (limited to 'meta/classes/cpan-base.bbclass')
| -rw-r--r-- | meta/classes/cpan-base.bbclass | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 6cd2aa340f..b5dbdaea81 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass @@ -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): |