diff options
Diffstat (limited to 'meta/classes')
-rw-r--r-- | meta/classes/ccdv.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/distutils.bbclass | 4 | ||||
-rw-r--r-- | meta/classes/mozilla.bbclass | 6 | ||||
-rw-r--r-- | meta/classes/native.bbclass | 1 | ||||
-rw-r--r-- | meta/classes/package_deb.bbclass | 2 | ||||
-rw-r--r-- | meta/classes/scons.bbclass | 4 |
6 files changed, 10 insertions, 9 deletions
diff --git a/meta/classes/ccdv.bbclass b/meta/classes/ccdv.bbclass index a28ea67..8c8306c 100644 --- a/meta/classes/ccdv.bbclass +++ b/meta/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/meta/classes/distutils.bbclass b/meta/classes/distutils.bbclass index a2b0e2b..5f57a9e 100644 --- a/meta/classes/distutils.bbclass +++ b/meta/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/meta/classes/mozilla.bbclass b/meta/classes/mozilla.bbclass index 3295c2b..bd8e919 100644 --- a/meta/classes/mozilla.bbclass +++ b/meta/classes/mozilla.bbclass @@ -19,7 +19,7 @@ export MOZ_OBJDIR = "${S}" export CONFIGURE_ARGS = "${EXTRA_OECONF}" export HOST_LIBIDL_CFLAGS = "`${HOST_LIBIDL_CONFIG} --cflags`" export HOST_LIBIDL_LIBS = "`${HOST_LIBIDL_CONFIG} --libs`" -export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_BINDIR}/../share/pkgconfig pkg-config libIDL-2.0" +export HOST_LIBIDL_CONFIG = "PKG_CONFIG_PATH=${STAGING_DIR}/${BUILD_SYS}/share/pkgconfig pkg-config libIDL-2.0" export HOST_CC = "${BUILD_CC}" export HOST_CXX = "${BUILD_CXX}" export HOST_CFLAGS = "${BUILD_CFLAGS}" @@ -33,8 +33,8 @@ mozilla_do_configure() { set -e for cg in `find ${S} -name config.guess`; do install -m 0755 \ - ${STAGING_BINDIR}/../share/gnu-config/config.guess \ - ${STAGING_BINDIR}/../share/gnu-config/config.sub \ + ${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.guess \ + ${STAGING_DIR}/${BUILD_SYS}/share/gnu-config/config.sub \ `dirname $cg`/ done ) diff --git a/meta/classes/native.bbclass b/meta/classes/native.bbclass index 04ff7d9..7d80c9c 100644 --- a/meta/classes/native.bbclass +++ b/meta/classes/native.bbclass @@ -36,6 +36,7 @@ CXXFLAGS = "${BUILD_CFLAGS}" LDFLAGS = "${BUILD_LDFLAGS}" LDFLAGS_build-darwin = "-L${STAGING_DIR}/${BUILD_SYS}/lib " +STAGING_BINDIR = "${STAGING_BINDIR_NATIVE}" # set the compiler as well. It could have been set to something else export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}" diff --git a/meta/classes/package_deb.bbclass b/meta/classes/package_deb.bbclass index ae085c3..f346fce 100644 --- a/meta/classes/package_deb.bbclass +++ b/meta/classes/package_deb.bbclass @@ -18,7 +18,7 @@ python do_package_deb_install () { rootfs = bb.data.getVar('IMAGE_ROOTFS', d, 1) debdir = bb.data.getVar('DEPLOY_DIR_DEB', d, 1) stagingdir = bb.data.getVar('STAGING_DIR', d, 1) - stagingbindir = bb.data.getVar('STAGING_BINDIR', d, 1) + stagingbindir = bb.data.getVar('STAGING_BINDIR_NATIVE', d, 1) tmpdir = bb.data.getVar('TMPDIR', d, 1) if None in (pkg,pkgfn,rootfs): diff --git a/meta/classes/scons.bbclass b/meta/classes/scons.bbclass index 3160eca..89b5da2 100644 --- a/meta/classes/scons.bbclass +++ b/meta/classes/scons.bbclass @@ -1,12 +1,12 @@ DEPENDS += "python-scons-native" scons_do_compile() { - ${STAGING_BINDIR}/scons || \ + ${STAGING_BINDIR_NATIVE}/scons || \ oefatal "scons build execution failed." } scons_do_install() { - ${STAGING_BINDIR}/scons install || \ + ${STAGING_BINDIR_NATIVE}/scons install || \ oefatal "scons install execution failed." } |