From: Roy Li <rongqing...@windriver.com>
Config_heavy-target.pl is needed by perl-native, not perl; since
perl-configpm-switch.patch, which uses Config_heavy-target.pl, is
applied into native package, and Config_heavy-target.pl is used
when PERLCONFIGTARGET is yes in cpan.bbclass
This fixed a building failure when autoloader is used:
Can't locate Config_heavy-target.pl in @INC (@INC contains: ...) at
tmp/sysroots/x86_64-linux/usr/lib/perl-native/perl/5.22.0/Config.pm line 88
Signed-off-by: Roy Li <rongqing...@windriver.com>
---
meta/recipes-devtools/perl/perl-native_5.22.0.bb | 2 ++
meta/recipes-devtools/perl/perl_5.22.0.bb | 6 +-----
2 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
index b4dda31..09d399c 100644
--- a/meta/recipes-devtools/perl/perl-native_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl-native_5.22.0.bb
@@ -94,6 +94,8 @@ do_install () {
install $i ${D}${libdir}/perl/${PV}/CORE
done
+ ln -s Config_heavy.pl ${D}${libdir}/perl/${PV}/Config_heavy-target.pl
+
# Those wrappers mean that perl installed from sstate (which may change
# path location) works and that in the nativesdk case, the SDK can be
# installed to a different location from the one it was built for.
diff --git a/meta/recipes-devtools/perl/perl_5.22.0.bb
b/meta/recipes-devtools/perl/perl_5.22.0.bb
index 55ce73f..84cc651 100644
--- a/meta/recipes-devtools/perl/perl_5.22.0.bb
+++ b/meta/recipes-devtools/perl/perl_5.22.0.bb
@@ -241,10 +241,7 @@ do_install() {
# target config, used by cpan.bbclass to extract version information
install config.sh ${D}${libdir}/perl
-
- ln -s Config_heavy.pl ${D}${libdir}/perl/${PV}/Config_heavy-target.pl
}
-
do_install_append_class-nativesdk () {
create_wrapper ${D}${bindir}/perl \
PERL5LIB='$PERL5LIB:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/site_perl/${PV}:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/vendor_perl/${PV}:$OECORE_NATIVE_SYSROOT/${libdir_nativesdk}/perl/${PV}'
@@ -298,8 +295,7 @@ FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE"
FILES_${PN}-lib = "${libdir}/libperl.so* \
${libdir}/perl5 \
${libdir}/perl/config.sh \
- ${libdir}/perl/${PV}/Config_heavy.pl \
- ${libdir}/perl/${PV}/Config_heavy-target.pl"
+ ${libdir}/perl/${PV}/Config_heavy.pl"
FILES_${PN}-pod = "${libdir}/perl/${PV}/pod \
${libdir}/perl/${PV}/*.pod \
${libdir}/perl/${PV}/*/*.pod \
--
1.9.1
--
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
