Skip to contentSkip to conversation

perl: avoid splitting out .debug directories as packages

PATCH New Paul Eggleton 1 participant 1 message Mar 21, 2013

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 perl: avoid splitting out .debug directories as packages

The recursive parameter is set to True, the regex for the first call to do_split_packages matches any path under ${libdir}/perl/${PV}/auto/, and the .debug directories contain .so files, so each one was getting picked up as a package. Change the regex to disallow dots in the path beneath auto/ and thus avoid the .debug directories.

Fixes [YOCTO #4048].

---
 meta/recipes-devtools/perl/perl_5.14.3.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
meta/recipes-devtools/perl/perl_5.14.3.bb +1 -1
index 1c3566b..72efc63 100644
@@ -309,7 +309,7 @@ PACKAGES_append = " perl-modules "
 
 python populate_packages_prepend () {
     libdir = d.expand('${libdir}/perl/${PV}')
-    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, '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)
Signature · 1 line
1.7.10.4