diff options
| author |   Roman I Khimov <khimov@altell.ru> | 2010-03-24 20:20:50 +0300 |
|---|---|---|
| committer | Roman I Khimov <khimov@altell.ru> | 2010-03-24 20:20:50 +0300 |
| commit | c67a7e4b81aedc340399649f62e5a02036a80a48 (patch) | |
| tree | 2e2092ddf4c6933a53d53b8d57e630c2895892b7 /classes | |
| parent | 71341fee3cd2cac082be9534607d79256eeff05e (diff) | |
| parent | 49fa8c1ad4c6e1ae5cb1c4e09105aa225ab735f6 (diff) | |
| download | openembedded-c67a7e4b81aedc340399649f62e5a02036a80a48.tar.gz | |
Merge branch 'perl-5.10' into org.openembedded.dev
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cpan-base.bbclass | 10 | ||||
| -rw-r--r-- | classes/cpan_build.bbclass | 10 |
2 files changed, 12 insertions, 8 deletions
diff --git a/classes/cpan-base.bbclass b/classes/cpan-base.bbclass index 8eb173eed5..6d3e234be8 100644 --- a/classes/cpan-base.bbclass +++ b/classes/cpan-base.bbclass @@ -17,7 +17,7 @@ def get_perl_version(d): return None l = f.readlines(); f.close(); - r = re.compile("version='(\d\.\d\.\d)'") + r = re.compile("version='(\d+\.\d+\.\d+)'") for s in l: m = r.match(s) if m: @@ -35,6 +35,14 @@ def is_target(d): return "yes" return "no" +def perl_get_version_suffix(d): + if bb.data.expand('${PACKAGE_ARCH}', d) != "all": + return '-' + get_perl_version(d) + else: + return '' + +PR .= "${@perl_get_version_suffix(d)}" + PERLLIBDIRS = "${@perl_get_libdirs(d)}" FILES_${PN}-dbg += "${PERLLIBDIRS}/auto/*/.debug \ diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass index 899c4010ac..56f58168c7 100644 --- a/classes/cpan_build.bbclass +++ b/classes/cpan_build.bbclass @@ -3,7 +3,7 @@ # inherit cpan-base -INHIBIT_NATIVE_STAGE_INSTALL = "1" +NATIVE_INSTALL_WORKS = "1" # # We also need to have built libmodule-build-perl-native for @@ -46,12 +46,8 @@ cpan_build_do_compile () { cpan_build_do_install () { if [ ${@is_target(d)} == "yes" ]; then perl Build install - fi -} - -do_stage_append () { - if [ ${@is_target(d)} == "no" ]; then - perl Build install + else + perl Build install destdir="${WORKDIR}/image" fi } |