diff options
Diffstat (limited to 'meta/classes/cpan-base.bbclass')
-rw-r--r-- | meta/classes/cpan-base.bbclass | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 82fd5b459a..c90a8fbc27 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass | |||
@@ -24,20 +24,10 @@ def get_perl_version(d): | |||
24 | return m.group(1) | 24 | return m.group(1) |
25 | return None | 25 | return None |
26 | 26 | ||
27 | # Only 5.8.7 and 5.8.4 existed at the time we moved to the new layout | ||
28 | def is_new_perl(d): | ||
29 | ver = get_perl_version(d) | ||
30 | if ver == "5.8.4" or ver == "5.8.7": | ||
31 | return "no" | ||
32 | return "yes" | ||
33 | |||
34 | # Determine where the library directories are | 27 | # Determine where the library directories are |
35 | def perl_get_libdirs(d): | 28 | def perl_get_libdirs(d): |
36 | libdir = bb.data.getVar('libdir', d, 1) | 29 | libdir = bb.data.getVar('libdir', d, 1) |
37 | if is_new_perl(d) == "yes": | 30 | libdirs = libdir + '/*/*/perl5' |
38 | libdirs = libdir + '/perl5' | ||
39 | else: | ||
40 | libdirs = libdir + '/*/*/perl5' | ||
41 | return libdirs | 31 | return libdirs |
42 | 32 | ||
43 | def is_target(d): | 33 | def is_target(d): |
@@ -45,7 +35,6 @@ def is_target(d): | |||
45 | return "yes" | 35 | return "yes" |
46 | return "no" | 36 | return "no" |
47 | 37 | ||
48 | IS_NEW_PERL = "${@is_new_perl(d)}" | ||
49 | PERLLIBDIRS = "${@perl_get_libdirs(d)}" | 38 | PERLLIBDIRS = "${@perl_get_libdirs(d)}" |
50 | 39 | ||
51 | FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \ | 40 | FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \ |