diff options
author | Wolfgang Denk <wd@denx.de> | 2014-11-05 20:29:51 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-11-25 11:39:59 +0000 |
commit | 322ba17fd841cac4db8a4740d1fd74a2a9468f90 (patch) | |
tree | c03b152092c9dd571146491f8384294cee3c8f82 | |
parent | 67261e2d7a2acd2646b4e25ab1456bec07e93834 (diff) | |
download | poky-322ba17fd841cac4db8a4740d1fd74a2a9468f90.tar.gz |
perl: fix PERL5LIB settings
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
(From OE-Core rev: 477ca2da14abaf072d3645c4be916760a48b8938)
Signed-off-by: Wolfgang Denk <wd@denx.de>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-devtools/perl/perl-native_5.20.0.bb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-devtools/perl/perl-native_5.20.0.bb b/meta/recipes-devtools/perl/perl-native_5.20.0.bb index 069696ae0c..01d40fcff2 100644 --- a/meta/recipes-devtools/perl/perl-native_5.20.0.bb +++ b/meta/recipes-devtools/perl/perl-native_5.20.0.bb | |||
@@ -103,8 +103,8 @@ do_install () { | |||
103 | install $i ${D}${libdir}/perl/${PV}/CORE | 103 | install $i ${D}${libdir}/perl/${PV}/CORE |
104 | done | 104 | done |
105 | 105 | ||
106 | create_wrapper ${D}${bindir}/perl PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/' | 106 | 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}' |
107 | create_wrapper ${D}${bindir}/perl${PV} PERL5LIB='$PERL5LIB:${STAGING_LIBDIR}/perl/${PV}:${STAGING_LIBDIR}/perl/' | 107 | 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}' |
108 | 108 | ||
109 | # Use /usr/bin/env nativeperl for the perl script. | 109 | # Use /usr/bin/env nativeperl for the perl script. |
110 | for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do | 110 | for f in `grep -Il '#! *${bindir}/perl' ${D}/${bindir}/*`; do |