diff options
Diffstat (limited to 'classes')
| -rw-r--r-- | classes/cpan.bbclass | 2 | ||||
| -rw-r--r-- | classes/cpan_build.bbclass | 17 |
2 files changed, 18 insertions, 1 deletions
diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass index c48bd1a980..0b90e754df 100644 --- a/classes/cpan.bbclass +++ b/classes/cpan.bbclass @@ -17,7 +17,7 @@ cpan_do_configure () { } cpan_do_compile () { - oe_runmake PASTHRU_INC="${CFLAGS}" + oe_runmake PASTHRU_INC="${CFLAGS}" CCFLAGS="${CFLAGS}" } cpan_do_install () { diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass index b7cdf7d821..0660ef9b82 100644 --- a/classes/cpan_build.bbclass +++ b/classes/cpan_build.bbclass @@ -7,6 +7,23 @@ FILES_${PN} += '${libdir}/perl5' DEPENDS += "perl-native" RDEPENDS += "perl" +# +# We also need to have built libmodule-build-perl-native for +# everything except libmodule-build-perl-native itself (which uses +# this class, but uses itself as the probider of +# libmodule-build-perl) +# +def cpan_build_dep_prepend(d): + import bb; + if bb.data.getVar('CPAN_BUILD_DEPS', d, 1): + return '' + pn = bb.data.getVar('PN', d, 1) + if pn in ['libmodule-build-perl', 'libmodule-build-perl-native']: + return '' + return 'libmodule-build-perl-native ' + +DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}" + def is_crosscompiling(d): import bb if not bb.data.inherits_class('native', d): |