diff options
Diffstat (limited to 'meta/classes/cpan.bbclass')
| -rw-r--r-- | meta/classes/cpan.bbclass | 17 |
1 files changed, 13 insertions, 4 deletions
diff --git a/meta/classes/cpan.bbclass b/meta/classes/cpan.bbclass index 957a6e2bfa..8e079e0d55 100644 --- a/meta/classes/cpan.bbclass +++ b/meta/classes/cpan.bbclass @@ -17,7 +17,16 @@ 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 + # 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 Makefile ] || bbfatal "No Makefile was generated by Makefile.PL" + if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then . ${STAGING_LIBDIR}${PERL_OWN_DIR}/perl/config.sh # Use find since there can be a Makefile generated for each Makefile.PL @@ -26,7 +35,7 @@ cpan_do_configure () { test -f $f2 || continue sed -i -e "s:\(PERL_ARCHLIB = \).*:\1${PERL_ARCHLIB}:" \ -e 's/perl.real/perl/' \ - -e "s/^\(CCFLAGS =.*\)/\1 ${CFLAGS}/" \ + -e "s|^\(CCFLAGS =.*\)|\1 ${CFLAGS}|" \ $f2 done fi @@ -38,8 +47,8 @@ cpan_do_compile () { cpan_do_install () { oe_runmake DESTDIR="${D}" install_vendor - for PERLSCRIPT in `grep -rIEl '#!${bindir}/perl-native.*/perl' ${D}`; do - sed -i -e 's|^#!${bindir}/perl-native.*/perl|#!/usr/bin/env nativeperl|' $PERLSCRIPT + for PERLSCRIPT in `grep -rIEl '#! *${bindir}/perl-native.*/perl' ${D}`; do + sed -i -e 's|${bindir}/perl-native.*/perl|/usr/bin/env nativeperl|' $PERLSCRIPT done } |