summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools/perl/perl_5.14.2.bb
diff options
context:
space:
mode:
authorHongxu Jia <hongxu.jia@windriver.com>2013-03-11 14:41:18 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-04-23 13:00:51 +0100
commit04b34a50eb5e3d2561e5107d746b7f22b8e44e70 (patch)
treeb5b63faa45b226a40b194deef939dda09aa46cfe /meta/recipes-devtools/perl/perl_5.14.2.bb
parent286c2dfc55f423dae0e357f000f157530441b33e (diff)
downloadpoky-04b34a50eb5e3d2561e5107d746b7f22b8e44e70.tar.gz
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] (From OE-Core rev: ecffb5bc90d71d903ca2701383b4229e389a812b) Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/perl/perl_5.14.2.bb')
-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} \
251 ${libdir}/perl/${PV}/warnings \ 251 ${libdir}/perl/${PV}/warnings \
252 ${libdir}/perl/${PV}/vars.pm \ 252 ${libdir}/perl/${PV}/vars.pm \
253 " 253 "
254RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings" 254RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \
255 perl-module-warnings-register"
255FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE" 256FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE"
256FILES_${PN}-lib = "${libdir}/libperl.so* \ 257FILES_${PN}-lib = "${libdir}/libperl.so* \
257 ${libdir}/perl5 \ 258 ${libdir}/perl5 \
@@ -305,9 +306,9 @@ PACKAGES_append = " perl-modules "
305 306
306python populate_packages_prepend () { 307python populate_packages_prepend () {
307 libdir = d.expand('${libdir}/perl/${PV}') 308 libdir = d.expand('${libdir}/perl/${PV}')
308 do_split_packages(d, libdir, 'auto/(Encode/.[^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 309 do_split_packages(d, libdir, 'auto/(.*)/[^/]*\.(so|ld|ix|al)', 'perl-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False)
309 do_split_packages(d, libdir, 'auto/([^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 310 do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
310 do_split_packages(d, libdir, 'Module/([^\/]*).*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 311 do_split_packages(d, libdir, 'Module/([^\/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
311 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) 312 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)
312 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 ', '')) 313 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 ', ''))
313} 314}