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:
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."
}
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}"
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
)
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}"
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):
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."
}
B = "${S}"
STAGING_DIR = "${TMPDIR}/staging"
-STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin"
+STAGING_BINDIR = "${STAGING_DIR}/${BUILD_SYS}/bin/${HOST_SYS}"
+STAGING_BINDIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}/bin"
STAGING_LIBDIR = "${STAGING_DIR}/${HOST_SYS}/lib"
STAGING_INCDIR = "${STAGING_DIR}/${HOST_SYS}/include"
STAGING_DATADIR = "${STAGING_DIR}/${HOST_SYS}/share"
CROSS_DIR = "${TMPDIR}/cross"
CROSS_DATADIR = "${CROSS_DIR}/share"
-export PATH_prepend = "${STAGING_BINDIR}/${HOST_SYS}:${STAGING_BINDIR}:${CROSS_DIR}/bin:"
+export PATH_prepend = "${STAGING_BINDIR}:${STAGING_BINDIR_NATIVE}:${CROSS_DIR}/bin:"
##################################################################
# Build utility info.
INITSCRIPT_PARAMS = "defaults"
do_compile() {
- oe_runmake "LIBTOOL=${STAGING_BINDIR}/${TARGET_PREFIX}libtool" apm apmd
+ oe_runmake "LIBTOOL=${STAGING_BINDIR_NATIVE}/${TARGET_PREFIX}libtool" apm apmd
}
do_stage() {
inherit autotools
EXTRA_OECONF="--enable-static --enable-shared"
-EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR}/${HOST_SYS}-libtool"'
+EXTRA_OEMAKE='"LIBTOOL=${STAGING_BINDIR_NATIVE}/${HOST_SYS}-libtool"'
CFLAGS_append = " -D_REENTRANT"
inherit autotools pkgconfig
-export PKG_CONFIG="${STAGING_BINDIR}/pkg-config"
+export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
EXTRA_OECONF = "--disable-binreloc"
file://config.sh-mipsel-linux \
file://config.sh-i686-linux"
-HOSTPERL="${STAGING_BINDIR}/perl${PV}"
+HOSTPERL="${STAGING_BINDIR_NATIVE}/perl${PV}"
do_configure() {
- ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
+ ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
cp ${HOSTPERL} hostperl
cd Cross
rm Makefile.SH.patch
PR = "r21"
do_configure() {
- ln -sf ${HOSTPERL} ${STAGING_BINDIR}/hostperl
+ ln -sf ${HOSTPERL} ${STAGING_BINDIR_NATIVE}/hostperl
cp ${HOSTPERL} hostperl
cd Cross
rm Makefile.SH.patch
file://game.png"
do_compile_prepend = " \
- export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR}/pkg-config gtk+-2.0 --libs`'; \
- export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR}/pkg-config gtk+-2.0 --cflags`'; "
+ export XLDFLAGS='${LDFLAGS} `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --libs`'; \
+ export CFLAGS='${CFLAGS} -I./ `${STAGING_BINDIR_NATIVE}/pkg-config gtk+-2.0 --cflags`'; "
FILES_${PN} = "${prefix}/games/* ${datadir}/applications/* ${datadir}/pixmaps"
FILES_${PN}-dbg += "${prefix}/games/.debug"
}
do_stage() {
- install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/
+ install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR_NATIVE}/
}
do_install() {