firefox: Perform a number of cleanups and fix consistency issues.

[openembedded.git] / classes / cpan_build.bbclass

diff --git a/classes/cpan_build.bbclass b/classes/cpan_build.bbclass
index 63e716c..b2ec825 100644 (file)
--- a/classes/cpan_build.bbclass
+++ b/classes/cpan_build.bbclass
@@ -12,7 +12,6 @@ INHIBIT_NATIVE_STAGE_INSTALL = "1"
 # 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)
@@ -25,7 +24,7 @@ DEPENDS_prepend = "${@cpan_build_dep_prepend(d)}"
 cpan_build_do_configure () {
        if [ ${@is_target(d)} == "yes" ]; then
                # build for target
-               . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
+               . ${STAGING_LIBDIR}/perl/config.sh
                if [ "${IS_NEW_PERL}" = "yes" ]; then
                        perl Build.PL --installdirs vendor \
                                --destdir ${D} \