diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/cpan-base.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/cpan.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/cpan_build.bbclass | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 919a9b06a5..82fd5b459a 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass | |||
@@ -10,7 +10,7 @@ RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" | |||
10 | # Determine the staged version of perl from the perl configuration file | 10 | # Determine the staged version of perl from the perl configuration file |
11 | def get_perl_version(d): | 11 | def get_perl_version(d): |
12 | import re | 12 | import re |
13 | cfg = bb.data.expand('${STAGING_DIR}/${HOST_SYS}/perl/config.sh', d) | 13 | cfg = bb.data.expand('${STAGING_LIBDIR}/perl/config.sh', d) |
14 | try: | 14 | try: |
15 | f = open(cfg, 'r') | 15 | f = open(cfg, 'r') |
16 | except IOError: | 16 | except IOError: |
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass index ca5303d97f..66054bc755 100644 --- a/meta/classes/cpan.bbclass +++ b/meta/classes/cpan.bbclass | |||
@@ -10,11 +10,13 @@ export PERLCONFIGTARGET = "${@is_target(d)}" | |||
10 | 10 | ||
11 | # Env var which tells perl where the perl include files are | 11 | # Env var which tells perl where the perl include files are |
12 | export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" | 12 | export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" |
13 | export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}" | ||
14 | export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}" | ||
13 | 15 | ||
14 | cpan_do_configure () { | 16 | cpan_do_configure () { |
15 | yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} | 17 | yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} |
16 | if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then | 18 | if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then |
17 | . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh | 19 | . ${STAGING_LIBDIR}/perl/config.sh |
18 | if [ "${IS_NEW_PERL}" = "yes" ]; then | 20 | if [ "${IS_NEW_PERL}" = "yes" ]; then |
19 | sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \ | 21 | sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \ |
20 | -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \ | 22 | -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \ |
diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass index 9cfe72bcb7..6cac85c5fe 100644 --- a/meta/classes/cpan_build.bbclass +++ b/meta/classes/cpan_build.bbclass | |||
@@ -22,7 +22,7 @@ DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}" | |||
22 | cpan_build_do_configure () { | 22 | cpan_build_do_configure () { |
23 | if [ ${@is_target(d)} == "yes" ]; then | 23 | if [ ${@is_target(d)} == "yes" ]; then |
24 | # build for target | 24 | # build for target |
25 | . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh | 25 | . ${STAGING_LIBDIR}/perl/config.sh |
26 | if [ "${IS_NEW_PERL}" = "yes" ]; then | 26 | if [ "${IS_NEW_PERL}" = "yes" ]; then |
27 | perl Build.PL --installdirs vendor \ | 27 | perl Build.PL --installdirs vendor \ |
28 | --destdir ${D} \ | 28 | --destdir ${D} \ |