diff options
-rw-r--r-- | meta/recipes-devtools/perl/perl_5.30.0.bb | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/meta/recipes-devtools/perl/perl_5.30.0.bb b/meta/recipes-devtools/perl/perl_5.30.0.bb index a221bce52b..ba2a8437d4 100644 --- a/meta/recipes-devtools/perl/perl_5.30.0.bb +++ b/meta/recipes-devtools/perl/perl_5.30.0.bb | |||
@@ -265,13 +265,23 @@ python split_perl_packages () { | |||
265 | # Read the pre-generated dependency file, and use it to set module dependecies | 265 | # Read the pre-generated dependency file, and use it to set module dependecies |
266 | for line in open(d.expand("${WORKDIR}") + '/perl-rdepends.txt').readlines(): | 266 | for line in open(d.expand("${WORKDIR}") + '/perl-rdepends.txt').readlines(): |
267 | splitline = line.split() | 267 | splitline = line.split() |
268 | module = splitline[0].replace("RDEPENDS_perl", "RDEPENDS_${PN}") | 268 | if bb.data.inherits_class('native', d): |
269 | depends = splitline[2].strip('"').replace("perl-module", "${PN}-module") | 269 | module = splitline[0] + '-native' |
270 | depends = "perl-native" | ||
271 | else: | ||
272 | module = splitline[0].replace("RDEPENDS_perl", "RDEPENDS_${PN}") | ||
273 | depends = splitline[2].strip('"').replace("perl-module", "${PN}-module") | ||
270 | d.appendVar(d.expand(module), " " + depends) | 274 | d.appendVar(d.expand(module), " " + depends) |
271 | } | 275 | } |
272 | 276 | ||
273 | PACKAGES_DYNAMIC_class-target += "^perl-module-.*" | 277 | python() { |
274 | PACKAGES_DYNAMIC_class-nativesdk += "^nativesdk-perl-module-.*" | 278 | if d.getVar('CLASSOVERRIDE') == "class-target": |
279 | d.setVar("PACKAGES_DYNAMIC", "^perl-module-.*(?<!native)$") | ||
280 | elif d.getVar('CLASSOVERRIDE') == "class-native": | ||
281 | d.setVar("PACKAGES_DYNAMIC", "^perl-module-.*-native$") | ||
282 | elif d.getVar('CLASSOVERRIDE') == "class-nativesdk": | ||
283 | d.setVar("PACKAGES_DYNAMIC", "^nativesdk-perl-module-.*") | ||
284 | } | ||
275 | 285 | ||
276 | RDEPENDS_${PN}-misc += "perl perl-modules" | 286 | RDEPENDS_${PN}-misc += "perl perl-modules" |
277 | RDEPENDS_${PN}-pod += "perl" | 287 | RDEPENDS_${PN}-pod += "perl" |