diff options
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.38.2.bb | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.38.2.bb b/meta/recipes-devtools/perl/perl_5.38.2.bb index a9d684cfc5..b6c9cda7ae 100644 --- a/meta/recipes-devtools/perl/perl_5.38.2.bb +++ b/meta/recipes-devtools/perl/perl_5.38.2.bb | |||
@@ -273,7 +273,7 @@ FILES:${PN} = "${bindir}/perl ${bindir}/perl.real ${bindir}/perl${PV} ${libdir}/ | |||
273 | ${libdir}/perl5/${PV}/ExtUtils/typemap \ | 273 | ${libdir}/perl5/${PV}/ExtUtils/typemap \ |
274 | " | 274 | " |
275 | RPROVIDES:${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \ | 275 | RPROVIDES:${PN} += "perl-module-strict perl-module-vars perl-module-config perl-module-warnings \ |
276 | perl-module-warnings-register" | 276 | perl-module-warnings-register perl-module-config-git" |
277 | 277 | ||
278 | FILES:${PN}-staticdev:append = " ${libdir}/perl5/${PV}/*/CORE/libperl.a" | 278 | FILES:${PN}-staticdev:append = " ${libdir}/perl5/${PV}/*/CORE/libperl.a" |
279 | 279 | ||
@@ -306,8 +306,8 @@ ALTERNATIVE_PRIORITY = "40" | |||
306 | ALTERNATIVE:${PN}-doc = "Thread.3" | 306 | ALTERNATIVE:${PN}-doc = "Thread.3" |
307 | ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" | 307 | ALTERNATIVE_LINK_NAME[Thread.3] = "${mandir}/man3/Thread.3" |
308 | 308 | ||
309 | # Create a perl-modules package recommending all the other perl | 309 | # Create a perl-modules package that represents the collection of all the |
310 | # packages (actually the non modules packages and not created too) | 310 | # other perl packages (actually the non modules packages and not created too). |
311 | ALLOW_EMPTY:${PN}-modules = "1" | 311 | ALLOW_EMPTY:${PN}-modules = "1" |
312 | PACKAGES += "${PN}-modules " | 312 | PACKAGES += "${PN}-modules " |
313 | 313 | ||
@@ -322,11 +322,13 @@ python split_perl_packages () { | |||
322 | do_split_packages(d, libdir, r'.*linux/([^\/].*)\.(pm|pl|e2x)', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 322 | do_split_packages(d, libdir, r'.*linux/([^\/].*)\.(pm|pl|e2x)', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
323 | do_split_packages(d, libdir, r'(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/|.*linux\/)[^\/]).*)\.(pm|pl|e2x)', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) | 323 | do_split_packages(d, libdir, r'(^(?!(CPAN\/|CPANPLUS\/|Module\/|unicore\/|.*linux\/)[^\/]).*)\.(pm|pl|e2x)', '${PN}-module-%s', 'perl module %s', recursive=True, allow_dirs=False, match_path=True, prepend=False) |
324 | 324 | ||
325 | # perl-modules should recommend every perl module, and only the | 325 | # perl-modules should runtime-depend on every perl module, and only the |
326 | # modules. Don't attempt to use the result of do_split_packages() as some | 326 | # modules. Don't attempt to use the result of do_split_packages() as some |
327 | # modules are manually split (eg. perl-module-unicore). | 327 | # modules are manually split (eg. perl-module-unicore). Also, the split |
328 | packages = filter(lambda p: 'perl-module-' in p, d.getVar('PACKAGES').split()) | 328 | # packages should not include packages defined in RPROVIDES:${PN}. |
329 | d.setVar(d.expand("RRECOMMENDS:${PN}-modules"), ' '.join(packages)) | 329 | perl_sub_pkgs = d.getVar(d.expand("RPROVIDES:${PN}")).split() |
330 | packages = filter(lambda p: 'perl-module-' in p and p not in perl_sub_pkgs, d.getVar('PACKAGES').split()) | ||
331 | d.setVar(d.expand("RDEPENDS:${PN}-modules"), ' '.join(packages)) | ||
330 | 332 | ||
331 | # Read the pre-generated dependency file, and use it to set module dependecies | 333 | # Read the pre-generated dependency file, and use it to set module dependecies |
332 | for line in open(d.expand("${WORKDIR}") + '/perl-rdepends.txt').readlines(): | 334 | for line in open(d.expand("${WORKDIR}") + '/perl-rdepends.txt').readlines(): |
@@ -352,7 +354,8 @@ python() { | |||
352 | d.setVar("PACKAGES_DYNAMIC", "^nativesdk-perl-module-.*") | 354 | d.setVar("PACKAGES_DYNAMIC", "^nativesdk-perl-module-.*") |
353 | } | 355 | } |
354 | 356 | ||
355 | RDEPENDS:${PN}-misc += "perl perl-modules" | 357 | RDEPENDS:${PN}-misc += "perl" |
358 | RRECOMMENDS:${PN}-misc += "perl-modules" | ||
356 | RDEPENDS:${PN}-pod += "perl" | 359 | RDEPENDS:${PN}-pod += "perl" |
357 | 360 | ||
358 | BBCLASSEXTEND = "native nativesdk" | 361 | BBCLASSEXTEND = "native nativesdk" |