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 | |
| 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')
| -rw-r--r-- | meta/classes/cpan-base.bbclass | 10 | ||||
| -rw-r--r-- | meta/classes/cpan.bbclass | 12 |
2 files changed, 13 insertions, 9 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): diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass index 9b8431bed0..cbf428d3a2 100644 --- a/meta/classes/cpan.bbclass +++ b/meta/classes/cpan.bbclass @@ -1,7 +1,7 @@ # # This is for perl modules that use the old Makefile.PL build system # -inherit cpan-base +inherit cpan-base perlnative EXTRA_CPANFLAGS ?= "" EXTRA_PERLFLAGS ?= "" @@ -10,16 +10,16 @@ EXTRA_PERLFLAGS ?= "" export PERLCONFIGTARGET = "${@is_target(d)}" # Env var which tells perl where the perl include files are -export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" -export PERL_LIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}" -export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}" -export PERLHOSTLIB = "${STAGING_LIBDIR_NATIVE}/perl/${@get_perl_version(d)}/" +export PERL_INC = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}/CORE" +export PERL_LIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" +export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" +export PERLHOSTLIB = "${STAGING_LIBDIR_NATIVE}/perl-native/perl/${@get_perl_version(d)}/" cpan_do_configure () { export PERL5LIB="${PERL_ARCHLIB}" yes '' | perl ${EXTRA_PERLFLAGS} Makefile.PL ${EXTRA_CPANFLAGS} if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then - . ${STAGING_LIBDIR}/perl/config.sh + . ${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh # Use find since there can be a Makefile generated for each Makefile.PL for f in `find -name Makefile.PL`; do f2=`echo $f | sed -e 's/.PL//'` |