diff options
| -rw-r--r-- | meta/classes/cpan-base.bbclass | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/meta/classes/cpan-base.bbclass b/meta/classes/cpan-base.bbclass index 7810a4dc61..a3d08f4a90 100644 --- a/meta/classes/cpan-base.bbclass +++ b/meta/classes/cpan-base.bbclass | |||
| @@ -29,20 +29,13 @@ def get_perl_version(d): | |||
| 29 | return m.group(1) | 29 | return m.group(1) |
| 30 | return None | 30 | return None |
| 31 | 31 | ||
| 32 | # Determine where the library directories are | ||
| 33 | def perl_get_libdirs(d): | ||
| 34 | libdir = d.getVar('libdir', True) | ||
| 35 | if is_target(d) == "no": | ||
| 36 | libdir += '/perl-native' | ||
| 37 | libdir += '/perl' | ||
| 38 | return libdir | ||
| 39 | |||
| 40 | def is_target(d): | 32 | def is_target(d): |
| 41 | if not bb.data.inherits_class('native', d): | 33 | if not bb.data.inherits_class('native', d): |
| 42 | return "yes" | 34 | return "yes" |
| 43 | return "no" | 35 | return "no" |
| 44 | 36 | ||
| 45 | PERLLIBDIRS := "${@perl_get_libdirs(d)}" | 37 | PERLLIBDIRS = "${libdir}/perl" |
| 38 | PERLLIBDIRS_class-native = "${libdir}/perl-native" | ||
| 46 | PERLVERSION := "${@get_perl_version(d)}" | 39 | PERLVERSION := "${@get_perl_version(d)}" |
| 47 | PERLVERSION[vardepvalue] = "" | 40 | PERLVERSION[vardepvalue] = "" |
| 48 | 41 | ||
