diff options
| author | Jens Rehsack <rehsack@gmail.com> | 2015-10-08 16:21:21 +0200 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-10-29 07:28:31 +0000 |
| commit | 6948d2bd35cda57f520f0180a6bb43cc70262f41 (patch) | |
| tree | 38311d156c909a11db24c359230b79c69fdcb9b5 /meta | |
| parent | 2e98b80a3a11798145f58c8ccc8b873cd713f4f2 (diff) | |
| download | openembedded-core-6948d2bd35cda57f520f0180a6bb43cc70262f41.tar.gz openembedded-core-6948d2bd35cda57f520f0180a6bb43cc70262f41.tar.bz2 openembedded-core-6948d2bd35cda57f520f0180a6bb43cc70262f41.zip | |
perl: fix Perl5 module builds
This patch fixes some issues in classes providing cpan module build support:
* add support even for xs modules with more than 3 levels as
B::Hooks::End::Of::Scope or Math::Random::ISAAC::XS
* correct handling of Module::Build (as far as stolen from pkgsrc
and my humble knowledge)
* configure to install to vendor_libs as default, even when
inherited do_install remains unused (overwritten do_install)
Signed-off-by: Jens Rehsack <sno@netbsd.org>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/classes/cpan-base.bbclass | 4 | ||||
| -rw-r--r-- | meta/classes/cpan.bbclass | 2 | ||||
| -rw-r--r-- | meta/classes/cpan_build.bbclass | 13 |
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] = "" FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \ ${PERLLIBDIRS}/auto/*/*/.debug \ ${PERLLIBDIRS}/auto/*/*/*/.debug \ + ${PERLLIBDIRS}/auto/*/*/*/*/.debug \ + ${PERLLIBDIRS}/auto/*/*/*/*/*/.debug \ ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/.debug \ ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/.debug \ ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/.debug \ + ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/*/.debug \ + ${PERLLIBDIRS}/vendor_perl/${PERLVERSION}/auto/*/*/*/*/*/.debug \ " 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 cpan_do_configure () { export PERL5LIB="${PERL_ARCHLIB}" - yes '' | perl ${EXTRA_PERLFLAGS} Makefile.PL ${EXTRA_CPANFLAGS} + yes '' | perl ${EXTRA_PERLFLAGS} Makefile.PL INSTALLDIRS=vendor ${EXTRA_CPANFLAGS} # Makefile.PLs can exit with success without generating a # 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 ?= "" # Env var which tells perl if it should use host (no) or target (yes) settings export PERLCONFIGTARGET = "${@is_target(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)}/" export LD = "${CCLD}" cpan_build_do_configure () { @@ -24,14 +25,22 @@ cpan_build_do_configure () { --install_path bindoc=${mandir}/man1 \ --install_path libdoc=${mandir}/man3 \ ${EXTRA_CPAN_BUILD_FLAGS} + + # Build.PLs can exit with success without generating a + # Build, e.g. in cases of missing configure time + # dependencies. This is considered a best practice by + # cpantesters.org. See: + # * http://wiki.cpantesters.org/wiki/CPANAuthorNotes + # * http://www.nntp.perl.org/group/perl.qa/2008/08/msg11236.html + [ -e Build ] || bbfatal "No Build was generated by Build.PL" } cpan_build_do_compile () { - perl Build + perl Build verbose=1 } cpan_build_do_install () { - perl Build install + perl Build install --destdir ${D} } EXPORT_FUNCTIONS do_configure do_compile do_install |