diff options
| author | Philip Balister <philip@balister.org> | 2007-06-01 17:38:18 +0000 |
|---|---|---|
| committer | Philip Balister <philip@balister.org> | 2007-06-01 17:38:18 +0000 |
| commit | 11b2f5bb1f6f2f7b45d1cab6f6a75916db8b23a6 (patch) | |
| tree | b0c9fed9177c704ed1c8f643f4e168322a8484b3 /classes | |
| parent | 310c1ed8d1ce25a6e24e1fb39931b86d85085c2c (diff) | |
| parent | a1b84ca79c1cd61dd5b2563104e69723070a6108 (diff) | |
merge of '7474030a47375702cb66f00aa7ded40e585cf3fd'
and '9f671f6c3a17dbd8450e267353cf95d120238e50'
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cpan-base.bbclass | 4 | ||||
| -rw-r--r-- | classes/cpan.bbclass | 3 | ||||
| -rw-r--r-- | classes/insane.bbclass | 11 | ||||
| -rw-r--r-- | classes/qpf.bbclass | 4 | ||||
| -rw-r--r-- | classes/siteinfo.bbclass | 2 |
5 files changed, 13 insertions, 11 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/insane.bbclass b/classes/insane.bbclass index 9f243c8c9a..963ace4221 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -54,10 +54,11 @@ def package_qa_get_machine_dict(): "sparc": ( 2, 0, 0, False, True), }, "linux-uclibc" : { - "arm" : (40, 97, 0, True, True), - "armeb": (40, 97, 0, False, True), - "powerpc": (20, 0, 0, False, True), - "mipsel": ( 8, 0, 0, True, True), + "arm" : ( 40, 97, 0, True, True), + "armeb": ( 40, 97, 0, False, True), + "powerpc": ( 20, 0, 0, False, True), + "mipsel": ( 8, 0, 0, True, True), + "avr32": (6317, 0, 0, False, True), }, "linux-gnueabi" : { "arm" : (40, 0, 0, True, True), @@ -219,7 +220,7 @@ def package_qa_check_rpath(file,name,d): bb.fatal("This class assumed that WORKDIR is ${TMPDIR}/work... Not doing any check") #bb.note("%s -B -F%%r#F %s" % (scanelf,file)) - output = os.popen("%s -B -F%%r#F %s" % (scanelf,file)) + output = os.popen("%s -B -F%%r#F '%s'" % (scanelf,file)) txt = output.readline().split() #bb.note("???%s???" % bad_dir_test) for line in txt: diff --git a/classes/qpf.bbclass b/classes/qpf.bbclass index d6e58871d5..67761bd4be 100644 --- a/classes/qpf.bbclass +++ b/classes/qpf.bbclass @@ -9,15 +9,11 @@ do_compile() { } pkg_postinst_fonts() { -#!/bin/sh -set -e . /etc/profile ${sbindir}/update-qtfontdir } pkg_postrm_fonts() { -#!/bin/sh -set -e . /etc/profile ${sbindir}/update-qtfontdir -f } 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",\ |