diff options
130 files changed, 208 insertions, 198 deletions
diff --git a/classes/ccdv.bbclass b/classes/ccdv.bbclass index a28ea672e5..8c8306cbf1 100644 --- a/classes/ccdv.bbclass +++ b/classes/ccdv.bbclass @@ -10,7 +10,7 @@ python () { def quiet_libtool(bb,d): deps = (bb.data.getVar('DEPENDS', d, 1) or "").split() if 'libtool-cross' in deps: - return "'LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool --silent'" + return "'LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool --silent'" elif 'libtool-native' in deps: return "'LIBTOOL=${B}/${HOST_SYS}-libtool --silent'" else: diff --git a/classes/distutils.bbclass b/classes/distutils.bbclass index a2b0e2b770..5f57a9ea19 100644 --- a/classes/distutils.bbclass +++ b/classes/distutils.bbclass @@ -2,13 +2,13 @@ inherit distutils-base distutils_do_compile() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR}/python setup.py build || \ + ${STAGING_BINDIR_NATIVE}/python setup.py build || \ oefatal "python setup.py build execution failed." } distutils_do_install() { BUILD_SYS=${BUILD_SYS} HOST_SYS=${HOST_SYS} \ - ${STAGING_BINDIR}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \ + ${STAGING_BINDIR_NATIVE}/python setup.py install --prefix=${D}/${prefix} --install-data=${D}/${datadir} || \ oefatal "python setup.py install execution failed." } diff --git a/classes/insane.bbclass b/classes/insane.bbclass index 4ff867b62f..e30375288d 100644 --- a/classes/insane.bbclass +++ b/classes/insane.bbclass @@ -28,7 +28,7 @@ def package_qa_check_rpath(file,name,d): Check for dangerous RPATHs """ import bb, os - scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR',d,True),'scanelf') + scanelf = os.path.join(bb.data.getVar('STAGING_BINDIR_NATIVE',d,True),'scanelf') bad_dir = bb.data.getVar('TMPDIR', d, True) + "/work" if not os.path.exists(scanelf): bb.note("Can not check RPATH scanelf not found") diff --git a/classes/mozilla.bbclass b/classes/mozilla.bbclass index 3295c2b270..bd8e9193d9 100644 --- a/classes/mozilla.bbclass +++ b/classes/mozilla.bbclass @@ -19,7 +19,7 @@ export MOZ_OBJDIR = "${S}" export CONFIGURE_A |