diff options
| author | Justin Patrin <papercrane@gmail.com> | 2007-06-01 06:56:18 +0000 |
|---|---|---|
| committer | Justin Patrin <papercrane@gmail.com> | 2007-06-01 06:56:18 +0000 |
| commit | 2a6a9de6d749394b2584e3ed9fbf7155bad16057 (patch) | |
| tree | 7c4fb0b59f00ae7edc5a504b991d4ff0dd9c9639 /classes | |
| parent | ffc3fe8a8f1a5de133366a7df62afac2f59dd4a2 (diff) | |
| parent | 47e64ac12cf87f33e2b2a7b5d77689915d98c374 (diff) | |
merge of '48538c8eb890138522fdaa67c07c26e8dccd5419'
and '73c801b307019899c3255b427e2bb7cb896f8375'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cpan-base.bbclass | 4 | ||||
| -rw-r--r-- | classes/cpan.bbclass | 3 | ||||
| -rw-r--r-- | classes/siteinfo.bbclass | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass index a5fdb33895..cc0d11e515 100644 --- a/classes/cpan-base.bbclass +++ b/classes/cpan-base.bbclass @@ -4,8 +4,8 @@ # FILES_${PN} += "${libdir}/perl5 ${datadir}/perl5" -DEPENDS += "perl perl-native" -RDEPENDS += "perl" +DEPENDS += "${@["perl", "perl-native"][(bb.data.inherits_class('native', d))]}" +RDEPENDS += "${@["perl", ""][(bb.data.inherits_class('native', d))]}" # Determine the staged version of perl from the perl configuration file def get_perl_version(d): diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index 3b1a2b72ca..3250528c7a 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -8,6 +8,9 @@ EXTRA_CPANFLAGS ?= "" # Env var which tells perl if it should use host (no) or target (yes) settings export PERLCONFIGTARGET = "${@is_target(d)}" +# Env var which tells perl where the perl include files are +export PERL_INC = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}/CORE" + cpan_do_configure () { yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS} if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then diff --git a/classes/siteinfo.bbclass b/classes/siteinfo.bbclass index 6868750d2d..43a9b55b28 100644 --- a/classes/siteinfo.bbclass +++ b/classes/siteinfo.bbclass @@ -29,6 +29,8 @@ def get_siteinfo_list(d): "arm-linux-gnueabi": "endian-little bit-32 common-glibc arm-common arm-linux",\ "arm-linux-uclibc": "endian-little bit-32 common-uclibc arm-common",\ "arm-linux-uclibcgnueabi": "endian-little bit-32 common-uclibc arm-common arm-linux-uclibc",\ + "avr32-linux": "endian-big bit-32 common-glibc",\ + "avr32-linux-uclibc": "endian-big bit-32 common-uclibc",\ "i386-linux": "endian-little bit-32 common-glibc ix86-common",\ "i486-linux": "endian-little bit-32 common-glibc ix86-common",\ "i586-linux": "endian-little bit-32 common-glibc ix86-common",\ |