sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

Fix STAGING_BINDIR for multimachine use by spliting into STAGING_BINDIR and STAGING_BINDIR_NATIVE and adding both to PATH 

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@958 311d38ba-8fff-0310-9ca6-ca027cbcb966
This commit is contained in:
Richard Purdie 2006-11-25 10:01:30 +00:00
parent 82dd73248d
commit 4f249a8efb
14 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meta/classes/ccdv.bbclass
View File

@ -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:

4
meta/classes/distutils.bbclass
View File

@ -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."
}

6
meta/classes/mozilla.bbclass
View File

@ -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
)

1
meta/classes/native.bbclass
View File

@ -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}"

2
meta/classes/package_deb.bbclass
View File

@ -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):

4
meta/classes/scons.bbclass
View File

@ -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."
}

5
meta/conf/bitbake.conf
View File

@ -156,7 +156,8 @@ S = "${WORKDIR}/${P}"
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"
@ -218,7 +219,7 @@ EXTRA_IMAGEDEPENDS = ""
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.

2
meta/packages/apmd/apmd_3.2.2.bb
View File

@ -22,7 +22,7 @@ INITSCRIPT_NAME = "apmd"
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() {

2
meta/packages/jpeg/jpeg_6b.bb
View File

@ -16,7 +16,7 @@ S = "${WORKDIR}/jpeg-${PV}"
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"

2
meta/packages/kf/kf_0.5.4.1.bb
View File

@ -9,7 +9,7 @@ SRC_URI = "http://jabberstudio.2nw.net/${PN}/${PN}-${PV}.tar.gz \
inherit autotools pkgconfig
export PKG_CONFIG="${STAGING_BINDIR}/pkg-config"
export PKG_CONFIG="${STAGING_BINDIR_NATIVE}/pkg-config"
EXTRA_OECONF = "--disable-binreloc"

4
meta/packages/perl/perl.inc
View File

@ -14,10 +14,10 @@ SRC_URI = "ftp://ftp.funet.fi/pub/CPAN/src/perl-${PV}.tar.gz \
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

2
meta/packages/perl/perl_5.8.7.bb
View File

@ -26,7 +26,7 @@ PARALLEL_MAKE = ""
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

4
meta/packages/puzzles/puzzles_r6915.bb
View File

@ -6,8 +6,8 @@ SRC_URI = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${PV}.tar
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"

2
meta/packages/update-rc.d/update-rc.d_0.7.bb
View File

@ -13,7 +13,7 @@ do_compile() {
}
do_stage() {
install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR}/
install -m 0755 ${S}/update-rc.d ${STAGING_BINDIR_NATIVE}/
}
do_install() {