aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-03-11 14:41:18 +0800
committerRoss Burton <ross.burton@intel.com>2013-04-23 10:38:45 +0100
commitecffb5bc90d71d903ca2701383b4229e389a812b (patch)
tree61b9264edc4d423f8904e53dcf9c42ad725a9185
parent45d4f46801fed8fe746a7e76c4732754950dd28d (diff)
downloadopenembedded-core-ecffb5bc90d71d903ca2701383b4229e389a812b.tar.gz
openembedded-core-ecffb5bc90d71d903ca2701383b4229e389a812b.tar.bz2
openembedded-core-ecffb5bc90d71d903ca2701383b4229e389a812b.zip
perl_5.14.2.bb:fix autoreconf run failed on gmae-toolchain
File warnings/register.pm has been moved to package perl, update RPROVIDES_perl to provides perl-module-warnings-register for backward compatibility. Update populate_package script for: 1 Way to deal directory 'Module/' is not right, it creates packages whose names end with '-pm'. Update to drop these packages. 2 Deal directory 'auto/' to put same name module file(.pm) and library file(.so) into one package. That because .pm file requires the same name .so file at runtime. Cherry-pick commit dd65b82d24afcf3982f6fb93a6503c71fdf40dbf [Yocto #3338] Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
-rw-r--r--meta/recipes-devtools/perl/perl_5.14.2.bb9
1 files changed, 5 insertions, 4 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.14.2.bb b/meta/recipes-devtools/perl/perl_5.14.2.bb
index fbe91fe5e5..1c520553c9 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -251,7 +251,8 @@ FILES_${PN} = "${bindir}/perl ${bindir}/perl${PV} \
${libdir}/perl/${PV}/warnings \
${libdir}/perl/${PV}/vars.pm \
"
-RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings"
+RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \
+ perl-module-warnings-register"
FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE"
FILES_${PN}-lib = "${libdir}/libperl.so* \
${libdir}/perl5 \
@@ -305,9 +306,9 @@ PACKAGES_append = " perl-modules "
python populate_packages_prepend () {
libdir = d.expand('${libdir}/perl/${PV}')
- do_split_packages(d, libdir, 'auto/(Encode/.[^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
- do_split_packages(d, libdir, 'auto/([^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
- do_split_packages(d, libdir, 'Module/([^\/]*).*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
+ do_split_packages(d, libdir, 'auto/(.*)/[^/]*\.(so|ld|ix|al)', 'perl-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False)
+ do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
+ do_split_packages(d, libdir, 'Module/([^\/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
do_split_packages(d, libdir, '(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/|auto\/)[^\/]).*)\.(pm|pl|e2x)', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
d.setVar("RRECOMMENDS_${PN}-modules", d.getVar('PACKAGES', True).replace('${PN}-modules ', '').replace('${PN}-dbg ', '').replace('${PN}-misc ', '').replace('${PN}-dev ', '').replace('${PN}-pod ', '').replace('${PN}-doc ', ''))
}