diff options
| author | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-27 08:23:05 +0000 |
|---|---|---|
| committer | Marcin Juszkiewicz <hrw@openembedded.org> | 2007-04-27 08:23:05 +0000 |
| commit | 3b374eeea75c1836dd14763413d6a69fd5257288 (patch) | |
| tree | 6f7ce7759384f61e8694108746e38d3e0380ac64 /classes/cpan.bbclass | |
| parent | 3cf447d1990e83a036a0272adb5eb198a8338784 (diff) | |
| parent | 3cc9d5463dac0412d5591b506e308f3e9cde0494 (diff) | |
merge of '666358c5490cf7ad12c0b64e3e81b9d28fde6536'
and 'a1a53de4dc6cdab69af325b6a2615e1c4b40caad'
Diffstat (limited to 'classes/cpan.bbclass')
| -rw-r--r-- | classes/cpan.bbclass | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 9915bf6f67..00709f7e18 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -31,7 +31,18 @@ def is_new_perl(d): return "no" return "yes" +# Determine where the library directories are +def perl_get_libdirs(d): + import bb + libdir = bb.data.getVar('libdir', d, 1) + if is_new_perl(d) == "yes": + libdirs = libdir + '/perl5' + else: + libdirs = libdir + '/*/*/perl5' + return libdirs + IS_NEW_PERL = "${@is_new_perl(d)}" +PERLLIBDIRS = "${@perl_get_libdirs(d)}" cpan_do_configure () { perl Makefile.PL ${EXTRA_CPANFLAGS} @@ -57,7 +68,7 @@ cpan_do_configure () { cpan_do_compile () { if [ "${IS_NEW_PERL}" = "yes" ]; then - oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD=${TARGET_SYS}-gcc + oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" LD="${CCLD}" else # You must use gcc to link on sh OPTIONS="" |