summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--meta/classes/cpan-base.bbclass4
-rw-r--r--meta/classes/cpan.bbclass2
-rw-r--r--meta/classes/cpan_build.bbclass13
3 files changed, 16 insertions, 3 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass
index d9817ba6b6..7810a4dc61 100644
--- a/meta/classes/cpan-base.bbclass
+++ b/meta/classes/cpan-base.bbclass
@@ -49,7 +49,11 @@ PERLVERSION[vardepvalue] = ""
49FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \ 49FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \
50 ${PERLLIBDIRS}/auto/*/*/.debug \ 50 ${PERLLIBDIRS}/auto/*/*/.debug \
51 ${PERLLIBDIRS}/auto/*/*/*/.debug \ 51 ${PERLLIBDIRS}/auto/*/*/*/.debug \
52 ${PERLLIBDIRS}/auto/*/*/*/*/.debug \
53 ${PERLLIBDIRS}/auto/*/*/*/*/*/.debug \
52 ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \ 54 ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \
53 ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \ 55 ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \
54 ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \ 56 ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \
57 ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/*/.debug \
58 ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/*/*/.debug \
55 " 59 "
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass
index e2bbd2f63a..8e079e0d55 100644
--- a/meta/classes/cpan.bbclass
+++ b/meta/classes/cpan.bbclass
@@ -17,7 +17,7 @@ export PERLHOSTLIB = "${STAGING_LIBDIR_NATIVE}/perl-native/perl/${@get_perl_vers
17 17
18cpan_do_configure () { 18cpan_do_configure () {
19 export PERL5LIB="${PERL_ARCHLIB}" 19 export PERL5LIB="${PERL_ARCHLIB}"
20 yes '' | perl ${EXTRA_PERLFLAGS} Makefile.PL ${EXTRA_CPANFLAGS} 20 yes '' | perl ${EXTRA_PERLFLAGS} Makefile.PL INSTALLDIRS=vendor ${EXTRA_CPANFLAGS}
21 21
22 # Makefile.PLs can exit with success without generating a 22 # Makefile.PLs can exit with success without generating a
23 # Makefile, e.g. in cases of missing configure time 23 # Makefile, e.g. in cases of missing configure time
diff --git a/meta/classes/cpan_build.bbclass b/meta/classes/cpan_build.bbclass
index 4f648a60cf..365374894f 100644
--- a/meta/classes/cpan_build.bbclass
+++ b/meta/classes/cpan_build.bbclass
@@ -8,6 +8,7 @@ EXTRA_CPAN_BUILD_FLAGS ?= ""
8# Env var which tells perl if it should use host (no) or target (yes) settings 8# Env var which tells perl if it should use host (no) or target (yes) settings
9export PERLCONFIGTARGET = "${@is_target(d)}" 9export PERLCONFIGTARGET = "${@is_target(d)}"
10export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}" 10export PERL_ARCHLIB = "${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/${@get_perl_version(d)}"
11export PERLHOSTLIB = "${STAGING_LIBDIR_NATIVE}/perl-native/perl/${@get_perl_version(d)}/"
11export LD = "${CCLD}" 12export LD = "${CCLD}"
12 13
13cpan_build_do_configure () { 14cpan_build_do_configure () {
@@ -24,14 +25,22 @@ cpan_build_do_configure () {
24 --install_path bindoc=${mandir}/man1 \ 25 --install_path bindoc=${mandir}/man1 \
25 --install_path libdoc=${mandir}/man3 \ 26 --install_path libdoc=${mandir}/man3 \
26 ${EXTRA_CPAN_BUILD_FLAGS} 27 ${EXTRA_CPAN_BUILD_FLAGS}
28
29 # Build.PLs can exit with success without generating a
30 # Build, e.g. in cases of missing configure time
31 # dependencies. This is considered a best practice by
32 # cpantesters.org. See:
33 # * http://wiki.cpantesters.org/wiki/CPANAuthorNotes
34 # * http://www.nntp.perl.org/group/perl.qa/2008/08/msg11236.html
35 [ -e Build ] || bbfatal "No Build was generated by Build.PL"
27} 36}
28 37
29cpan_build_do_compile () { 38cpan_build_do_compile () {
30 perl Build 39 perl Build verbose=1
31} 40}
32 41
33cpan_build_do_install () { 42cpan_build_do_install () {
34 perl Build install 43 perl Build install --destdir ${D}
35} 44}
36 45
37EXPORT_FUNCTIONS do_configure do_compile do_install 46EXPORT_FUNCTIONS do_configure do_compile do_install