Don't inherit siteinfo in base.bbclass

[openembedded.git] / classes / cpan.bbclass

diff --git a/classes/cpan.bbclass b/classes/cpan.bbclass
index 3b1a2b7..66054bc 100644 (file)
--- a/classes/cpan.bbclass
+++ b/classes/cpan.bbclass
@@ -8,23 +8,28 @@ 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"
+export PERL_LIB = "${STAGING_DATADIR}/perl/${@get_perl_version(d)}"
+export PERL_ARCHLIB = "${STAGING_LIBDIR}/perl/${@get_perl_version(d)}"
+
 cpan_do_configure () {
        yes '' | perl Makefile.PL ${EXTRA_CPANFLAGS}
        if [ "${BUILD_SYS}" != "${HOST_SYS}" ]; then
-               . ${STAGING_DIR}/${TARGET_SYS}/perl/config.sh
+               . ${STAGING_LIBDIR}/perl/config.sh
                if [ "${IS_NEW_PERL}" = "yes" ]; then
                        sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
                                -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
                                -e "s:\(INSTALLVENDORLIB = \).*:\1${D}${datadir}/perl5:" \
                                -e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5:" \
-                               -e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+                               -e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
                                Makefile
                else
                        sed -i -e "s:\(SITELIBEXP = \).*:\1${sitelibexp}:" \
                                -e "s:\(SITEARCHEXP = \).*:\1${sitearchexp}:" \
                                -e "s:\(INSTALLVENDORLIB = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
                                -e "s:\(INSTALLVENDORARCH = \).*:\1${D}${libdir}/perl5/site_perl/${version}:" \
-                               -e "s:\(LDDLFLAGS.*\)${STAGING_DIR}/${BUILD_SYS}/lib:\1${STAGING_LIBDIR}:" \
+                               -e "s:\(LDDLFLAGS.*\)${STAGING_LIBDIR_NATIVE}:\1${STAGING_LIBDIR}:" \
                                Makefile
                fi
        fi
@@ -47,7 +52,16 @@ cpan_do_compile () {
 }
 
 cpan_do_install () {
-       oe_runmake install_vendor
+       if [ ${@is_target(d)} = "yes" ]; then
+               oe_runmake install_vendor
+       fi
+}
+
+cpan_do_stage () {
+       if [ ${@is_target(d)} = "no" ]; then
+               oe_runmake install_vendor
+       fi
 }
+                                                               
 
-EXPORT_FUNCTIONS do_configure do_compile do_install
+EXPORT_FUNCTIONS do_configure do_compile do_install do_stage