]> code.ossystems Code Review - openembedded-core.git/commitdiff
perl: fix PERL5LIB settings
authorWolfgang Denk <wd@denx.de>
Wed, 5 Nov 2014 19:29:51 +0000 (20:29 +0100)
committerRichard Purdie <richard.purdie@linuxfoundation.org>
Tue, 25 Nov 2014 11:39:44 +0000 (11:39 +0000)
The PERL5LIB settings in the perl wrapper script did not include the
"site_perl" or "vendor_perl" directories, which caused some errors.

See https://bugzilla.yoctoproject.org/show_bug.cgi?id=6890

Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
meta/recipes-devtools/perl/perl-native_5.20.0.bb

index 069696ae0cd2580739cd3c8231f718187b4aa0e6..01d40fcff2a722661f595e4ce365772db6f72a4a 100644 (file)
@@ -103,8 +103,8 @@ do_install () {
                install $i ${D}${libdir}/perl/${PV}/CORE
        done
 
-       create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
-       create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/'
+       create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl:${STAGING_LIBDIR}/perl/site_perl/${PV}:${STAGING_LIBDIR}/perl/vendor_perl/${PV}'
+       create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl${STAGING_LIBDIR}/perl:${STAGING_LIBDIR}/perl/site_perl/${PV}:${STAGING_LIBDIR}/perl/vendor_perl/${PV}'
 
        # Use /usr/bin/env nativeperl for the perl script.
        for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do