aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--meta/classes/ccdv.bbclass2
-rw-r--r--meta/classes/distutils.bbclass4
-rw-r--r--meta/classes/mozilla.bbclass6
-rw-r--r--meta/classes/native.bbclass1
-rw-r--r--meta/classes/package_deb.bbclass2
-rw-r--r--meta/classes/scons.bbclass4
-rw-r--r--meta/conf/bitbake.conf5
-rw-r--r--meta/packages/apmd/apmd_3.2.2.bb2
-rw-r--r--meta/packages/jpeg/jpeg_6b.bb2
-rwxr-xr-xmeta/packages/kf/kf_0.5.4.1.bb2
-rw-r--r--meta/packages/perl/perl.inc4
-rw-r--r--meta/packages/perl/perl_5.8.7.bb2
-rw-r--r--meta/packages/puzzles/puzzles_r6915.bb4
-rw-r--r--meta/packages/update-rc.d/update-rc.d_0.7.bb2
14 files changed, 22 insertions, 20 deletions
diff --git a/meta/classes/ccdv.bbclass b/meta/classes/ccdv.bbclass
index a28ea672e5..8c8306cbf1 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 a2b0e2b770..5f57a9ea19 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 3295c2b270..bd8e9193d9 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 04ff7d92d1..7d80c9c2bd 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 ae085c301d..f346fceb82 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 3160eca69a..89b5da2d0e 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."
}
diff --git a/meta/conf/bitbake.conf b/meta/conf/bitbake.conf
index 21d68801e7..9f77c82e06 100644
--- a/meta/conf/bitbake.conf
+++ b/meta/conf/bitbake.conf
@@ -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.
diff --git a/meta/packages/apmd/apmd_3.2.2.bb b/meta/packages/apmd/apmd_3.2.2.bb
index 4a23f39590..94541581d3 100644
--- a/meta/packages/apmd/apmd_3.2.2.bb
+++ b/meta/packages/apmd/apmd_3.2.2.bb
@@ -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() {
diff --git a/meta/packages/jpeg/jpeg_6b.bb b/meta/packages/jpeg/jpeg_6b.bb
index 342197c8ad..978ae10be5 100644
--- a/meta/packages/jpeg/jpeg_6b.bb
+++ b/meta/packages/jpeg/jpeg_6b.bb
@@ -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"
diff --git a/meta/packages/kf/kf_0.5.4.1.bb b/meta/packages/kf/kf_0.5.4.1.bb
index 806a383579..cd4feffa6d 100755
--- a/meta/packages/kf/kf_0.5.4.1.bb
+++ b/meta/packages/kf/kf_0.5.4.1.bb
@@ -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"
diff --git a/meta/packages/perl/perl.inc b/meta/packages/perl/perl.inc
index 7e42f45314..6ee0ed702c 100644
--- a/meta/packages/perl/perl.inc
+++ b/meta/packages/perl/perl.inc
@@ -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
diff --git a/meta/packages/perl/perl_5.8.7.bb b/meta/packages/perl/perl_5.8.7.bb
index a7095433a3..40d499eac3 100644
--- a/meta/packages/perl/perl_5.8.7.bb
+++ b/meta/packages/perl/perl_5.8.7.bb
@@ -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
diff --git a/meta/packages/puzzles/puzzles_r6915.bb b/meta/packages/puzzles/puzzles_r6915.bb
index f8ffcb7d01..2c1d17dca8 100644
--- a/meta/packages/puzzles/puzzles_r6915.bb
+++ b/meta/packages/puzzles/puzzles_r6915.bb
@@ -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"
diff --git a/meta/packages/update-rc.d/update-rc.d_0.7.bb b/meta/packages/update-rc.d/update-rc.d_0.7.bb
index 5c7ef67aed..8070197b82 100644
--- a/meta/packages/update-rc.d/update-rc.d_0.7.bb
+++ b/meta/packages/update-rc.d/update-rc.d_0.7.bb
@@ -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() {
generated by cgit 1.2.3-korg (git 2.39.0) at 2024-05-01 21:04:29 +0000