summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorKang Kai <kai.kang@windriver.com>2012-11-05 11:27:11 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2013-01-07 11:09:36 +0000
commitdd65b82d24afcf3982f6fb93a6503c71fdf40dbf (patch)
tree06480dc37c8e76e9b51d2cc39c036e316b84de5b /meta/recipes-devtools
parent61583fe11f2494e37ec0dd6e3bdeadf33f25f199 (diff)
downloadpoky-dd65b82d24afcf3982f6fb93a6503c71fdf40dbf.tar.gz
perl: update RPROVIDES and popuate_package script
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. [Part of Yocto 3338] (From OE-Core rev: e8e03deb1eb8fbbf297ad4b07f7e1642102ae308) Signed-off-by: Kang Kai <kai.kang@windriver.com> Signed-off-by: Saul Wold <sgw@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-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 8cff7f58cf..8678e76dec 100644
--- a/meta/recipes-devtools/perl/perl_5.14.2.bb
+++ b/meta/recipes-devtools/perl/perl_5.14.2.bb
@@ -250,7 +250,8 @@ FILES_${PN} = "${bindir}/perl ${bindir}/perl${PV} \
250 ${libdir}/perl/${PV}/warnings \ 250 ${libdir}/perl/${PV}/warnings \
251 ${libdir}/perl/${PV}/vars.pm \ 251 ${libdir}/perl/${PV}/vars.pm \
252 " 252 "
253RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings" 253RPROVIDES_${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \
254 perl-module-warnings-register"
254FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE" 255FILES_${PN}-dev = "${libdir}/perl/${PV}/CORE"
255FILES_${PN}-lib = "${libdir}/libperl.so* \ 256FILES_${PN}-lib = "${libdir}/libperl.so* \
256 ${libdir}/perl5 \ 257 ${libdir}/perl5 \
@@ -304,9 +305,9 @@ PACKAGES_append = " perl-modules "
304 305
305python populate_packages_prepend () { 306python populate_packages_prepend () {
306 libdir = d.expand('${libdir}/perl/${PV}') 307 libdir = d.expand('${libdir}/perl/${PV}')
307 do_split_packages(d, libdir, 'auto/(Encode/.[^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 308 do_split_packages(d, libdir, 'auto/(.*)/[^/]*\.(so|ld|ix|al)', 'perl-module-%s', 'perl module %s', recursive=True, match_path=True, prepend=False)
308 do_split_packages(d, libdir, 'auto/([^/]*)/.*', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) 309 do_split_packages(d, libdir, 'Module/([^\/]*)\.pm', 'perl-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False)
309 do_split_packages(d, libdir, 'Module/([^\/]*).*', '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)
310 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) 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)
311 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 ', '')) 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 ', ''))
312} 313}