* [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
@ 2010-07-31 5:34 Khem Raj
2010-07-31 5:34 ` [PATCH 1/5] bitbake.conf, cmake.bbclass, cross.bbclass, icecc.bbclass: Point the toolchain paths to new multi-machine friendly toolchain install location Khem Raj
` (6 more replies)
0 siblings, 7 replies; 22+ messages in thread
From: Khem Raj @ 2010-07-31 5:34 UTC (permalink / raw)
To: openembedded-devel
Hi
Following series of patches are for making multi-machine toolchains co-exist with
new cross staging for toolchain.
It installs the toolchain in <native sysroot>/usr/${BASE_PACKAGE_ARCH}
this way we can have multiple toolchains co-existing for different sub-arches and major arches too.
I have booted a native-sdk-image on qemuarm successfully. The build for
beagleboard minimal image using different versions of toolchain went all fine too.
Please test these patches and if seem ok provide some ACKS/NACKS
Thanks
-Khem
^ permalink raw reply [flat|nested] 22+ messages in thread
* [PATCH 1/5] bitbake.conf, cmake.bbclass, cross.bbclass, icecc.bbclass: Point the toolchain paths to new multi-machine friendly toolchain install location.
2010-07-31 5:34 [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Khem Raj
@ 2010-07-31 5:34 ` Khem Raj
2010-07-31 5:34 ` [PATCH 2/5] binutils-cross.inc: Dont install duplicate copies of tools create relative symlinks instead Khem Raj
` (5 subsequent siblings)
6 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2010-07-31 5:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
classes/cmake.bbclass | 2 +-
classes/cross.bbclass | 4 ++--
classes/icecc.bbclass | 6 +++---
conf/bitbake.conf | 5 ++---
4 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/classes/cmake.bbclass b/classes/cmake.bbclass
index 2376012..4d53e47 100644
--- a/classes/cmake.bbclass
+++ b/classes/cmake.bbclass
@@ -37,7 +37,7 @@ cmake_do_generate_toolchain_file() {
# only search in the paths provided (from openembedded) so cmake doesnt pick
# up libraries and tools from the native build machine
- echo "set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${STAGING_DIR_NATIVE}${prefix_native} )" >> ${WORKDIR}/toolchain.cmake
+ echo "set( CMAKE_FIND_ROOT_PATH ${STAGING_DIR_HOST} ${STAGING_DIR_NATIVE} ${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH} )" >> ${WORKDIR}/toolchain.cmake
echo "set( CMAKE_FIND_ROOT_PATH_MODE_PROGRAM ONLY )" >> ${WORKDIR}/toolchain.cmake
echo "set( CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY )" >> ${WORKDIR}/toolchain.cmake
echo "set( CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY )" >> ${WORKDIR}/toolchain.cmake
diff --git a/classes/cross.bbclass b/classes/cross.bbclass
index db86192..99f4ede 100644
--- a/classes/cross.bbclass
+++ b/classes/cross.bbclass
@@ -44,9 +44,9 @@ target_base_libdir := "${base_libdir}"
target_prefix := "${prefix}"
# Overrides for paths
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
base_prefix = "${STAGING_DIR_NATIVE}"
-exec_prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${base_prefix}${prefix_native}/${BASE_PACKAGE_ARCH}"
+exec_prefix = "${prefix}"
base_sbindir = "${base_prefix}/bin"
sbindir = "${exec_prefix}/bin"
diff --git a/classes/icecc.bbclass b/classes/icecc.bbclass
index 938f199..cd5a25b 100644
--- a/classes/icecc.bbclass
+++ b/classes/icecc.bbclass
@@ -46,7 +46,7 @@ def create_cross_env(bb,d):
return ""
import tarfile, socket, time
- ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}', d)
+ ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}', d)
staging_dir = bb.data.expand('${STAGING_DIR_TARGET}', d)
prefix = bb.data.expand('${HOST_PREFIX}' , d)
distro = bb.data.expand('${DISTRO}', d)
@@ -96,7 +96,7 @@ def create_cross_env(bb,d):
def create_native_env(bb,d):
import tarfile, socket, time
- ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}', d)
+ ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}', d)
prefix = bb.data.expand('${HOST_PREFIX}' , d)
distro = bb.data.expand('${DISTRO}', d)
target_sys = bb.data.expand('${TARGET_SYS}', d)
@@ -143,7 +143,7 @@ def get_cross_kernel_cc(bb,d):
def create_cross_kernel_env(bb,d):
import tarfile, socket, time
- ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}', d)
+ ice_dir = bb.data.expand('${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}', d)
prefix = bb.data.expand('${HOST_PREFIX}' , d)
distro = bb.data.expand('${DISTRO}', d)
target_sys = bb.data.expand('${TARGET_SYS}', d)
diff --git a/conf/bitbake.conf b/conf/bitbake.conf
index d523519..8ddba15 100644
--- a/conf/bitbake.conf
+++ b/conf/bitbake.conf
@@ -299,8 +299,7 @@ STAGING_DIR_JAVA = "${STAGING_DIR}/java"
STAGING_DIR_NATIVE = "${STAGING_DIR}/${BUILD_SYS}"
STAGING_BINDIR_NATIVE = "${STAGING_DIR_NATIVE}${bindir_native}"
STAGING_SBINDIR_NATIVE = "${STAGING_DIR_NATIVE}${sbindir_native}"
-STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${bindir_native}/${MULTIMACH_HOST_SYS}"
-STAGING_BINDIR_CROSS_BASEPKG = "${STAGING_DIR_NATIVE}${bindir_native}/${BASEPKG_TARGET_SYS}"
+STAGING_BINDIR_CROSS = "${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}${base_bindir_native}"
STAGING_LIBDIR_NATIVE = "${STAGING_DIR_NATIVE}${libdir_native}"
STAGING_INCDIR_NATIVE = "${STAGING_DIR_NATIVE}${includedir_native}"
STAGING_ETCDIR_NATIVE = "${STAGING_DIR_NATIVE}${sysconfdir_native}"
@@ -419,7 +418,7 @@ export PATH
CCACHE ?= ""
TOOLCHAIN_OPTIONS = ""
-TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}"
+TOOLCHAIN_PATH ?= "${STAGING_DIR_NATIVE}${prefix_native}/${BASE_PACKAGE_ARCH}"
TOOLCHAIN_SYSPATH ?= "${TOOLCHAIN_PATH}/${TARGET_SYS}"
export CC = "${CCACHE}${HOST_PREFIX}gcc ${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
--
1.7.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 2/5] binutils-cross.inc: Dont install duplicate copies of tools create relative symlinks instead.
2010-07-31 5:34 [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Khem Raj
2010-07-31 5:34 ` [PATCH 1/5] bitbake.conf, cmake.bbclass, cross.bbclass, icecc.bbclass: Point the toolchain paths to new multi-machine friendly toolchain install location Khem Raj
@ 2010-07-31 5:34 ` Khem Raj
2010-07-31 5:34 ` [PATCH 3/5] gcc, eglibc: Use the paths for mutli-machine safe toolchain install Khem Raj
` (4 subsequent siblings)
6 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2010-07-31 5:34 UTC (permalink / raw)
To: openembedded-devel
* Dont generate shared libraries and bfd.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/binutils/binutils-cross.inc | 33 ++++++++++++++++++---------------
1 files changed, 18 insertions(+), 15 deletions(-)
diff --git a/recipes/binutils/binutils-cross.inc b/recipes/binutils/binutils-cross.inc
index f3ba5c3..ba3e6b5 100644
--- a/recipes/binutils/binutils-cross.inc
+++ b/recipes/binutils/binutils-cross.inc
@@ -5,25 +5,28 @@ PROVIDES = "virtual/${TARGET_PREFIX}binutils"
PACKAGES = ""
EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_TARGET} \
--program-prefix=${TARGET_PREFIX} \
- --enable-install-libbfd \
- --enable-shared \
--disable-werror \
"
do_install () {
oe_runmake 'DESTDIR=${D}' install
- install -m 0644 libiberty/pic/libiberty.a \
- ${D}${libdir}/libiberty_pic.a
-
+ rm -rf ${D}${prefix}/${TARGET_SYS}
# We don't really need these, so we'll remove them...
- rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/lib/ldscripts
- rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/info
- rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/locale
- rm -rf ${D}${STAGING_DIR_NATIVE}${prefix_native}/share/man
- rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/share || :
- rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}/gcc-lib || :
- rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64/gcc-lib || :
- rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir} || :
- rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${libdir}64 || :
- rmdir ${D}${STAGING_DIR_NATIVE}${prefix_native}/${prefix} || :
+ rm -rf ${D}${prefix}/lib/ldscripts
+ rm -rf ${D}${prefix}/share/info
+ rm -rf ${D}${prefix}/share/locale
+ rm -rf ${D}${prefix}/share/man
+ rmdir ${D}${prefix}/share || :
+ rmdir ${D}${prefix}/${libdir}/gcc-lib || :
+ rmdir ${D}${prefix}/${libdir}64/gcc-lib || :
+ rmdir ${D}${prefix}/${libdir} || :
+ rmdir ${D}${prefix}/${libdir}64 || :
+ rmdir ${D}${prefix}/${prefix} || :
+ # Insert symlinks into libexec so when tools without a prefix are searched for, the correct ones are
+ # found.
+ dest=${D}${prefix}/${TARGET_SYS}${base_bindir_native}
+ install -d $dest
+ for t in ar as ld nm objcopy objdump ranlib strip; do
+ ln -sf ../..${base_bindir_native}/${TARGET_PREFIX}$t $dest/$t
+ done
}
--
1.7.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 3/5] gcc, eglibc: Use the paths for mutli-machine safe toolchain install.
2010-07-31 5:34 [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Khem Raj
2010-07-31 5:34 ` [PATCH 1/5] bitbake.conf, cmake.bbclass, cross.bbclass, icecc.bbclass: Point the toolchain paths to new multi-machine friendly toolchain install location Khem Raj
2010-07-31 5:34 ` [PATCH 2/5] binutils-cross.inc: Dont install duplicate copies of tools create relative symlinks instead Khem Raj
@ 2010-07-31 5:34 ` Khem Raj
2010-07-31 5:34 ` [PATCH 4/5] recipes: Fix the PATHs for toolchains Khem Raj
` (3 subsequent siblings)
6 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2010-07-31 5:34 UTC (permalink / raw)
To: openembedded-devel
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/eglibc/eglibc-package.bbclass | 2 +-
recipes/gcc/gcc-configure-sdk.inc | 22 ++++++++++----------
recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb | 4 +-
.../gcc/gcc-cross-intermediate_csl-arm-2007q3.bb | 4 +-
recipes/gcc/gcc-cross-kernel.inc | 2 +-
recipes/gcc/gcc-cross-sdk_3.4.4.bb | 4 +-
recipes/gcc/gcc-cross_csl-arm-2007q3.bb | 6 ++--
recipes/gcc/gcc-cross_csl-arm-2008q1.bb | 6 ++--
recipes/gcc/gcc-cross_csl-arm-2008q3.bb | 6 ++--
recipes/gcc/gcc-package-cross.inc | 8 +++---
10 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/recipes/eglibc/eglibc-package.bbclass b/recipes/eglibc/eglibc-package.bbclass
index 4e286af..a041f93 100644
--- a/recipes/eglibc/eglibc-package.bbclass
+++ b/recipes/eglibc/eglibc-package.bbclass
@@ -170,7 +170,7 @@ do_prep_locale_tree() {
done
ls -d ${PKGD}${base_libdir}/* | xargs -iBLAH cp -pPR BLAH $treedir/lib
if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.* ]; then
- cp -pPR ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
+ cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.* $treedir/lib
fi
install -m 0755 ${PKGD}${bindir}/localedef $treedir/bin
}
diff --git a/recipes/gcc/gcc-configure-sdk.inc b/recipes/gcc/gcc-configure-sdk.inc
index d5a5942..328e780 100644
--- a/recipes/gcc/gcc-configure-sdk.inc
+++ b/recipes/gcc/gcc-configure-sdk.inc
@@ -5,23 +5,23 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibc", "no", "", d )}'
USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibceabi", "no", "", d )}'
EXTRA_OECONF_PATHS = "--with-sysroot=${prefix}/${TARGET_SYS} \
- --with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
+ --with-build-time-tools=${TOOLCHAIN_PATH}/${TARGET_SYS}/bin \
--with-build-sysroot=${STAGING_DIR_TARGET}"
#
# gcc-cross looks and finds these in ${exec_prefix} but we're not so lucky
# for the sdk. Hardcoding the paths ensures the build doesn't go canadian or worse.
#
-export AR_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ar"
-export AS_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/as"
-export DLLTOOL_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/dlltool"
-export LD_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ld"
-export LIPO_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/lipo"
-export NM_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/nm"
-export OBJDUMP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/objdump"
-export RANLIB_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ranlib"
-export STRIP_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/strip"
-export WINDRES_FOR_TARGET = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/windres"
+export AR_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/ar"
+export AS_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/as"
+export DLLTOOL_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/dlltool"
+export LD_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/ld"
+export LIPO_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/lipo"
+export NM_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/nm"
+export OBJDUMP_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/objdump"
+export RANLIB_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/ranlib"
+export STRIP_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/strip"
+export WINDRES_FOR_TARGET = "${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/windres"
#
# We need to override this and make sure the compiler can find staging
diff --git a/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb
index dd60164..110212b 100644
--- a/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross-initial_csl-arm-2007q3.bb
@@ -5,6 +5,6 @@ S = "${WORKDIR}/gcc-4.2"
# Hack till we fix *libc properly
do_install_append() {
- install -d ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
- ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+ install -d ${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+ ln -sf ${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/${BINV}/include/
}
diff --git a/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
index b9b34b6..b80ab0c 100644
--- a/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross-intermediate_csl-arm-2007q3.bb
@@ -5,6 +5,6 @@ S = "${WORKDIR}/gcc-4.2"
# Hack till we fix *libc properly
do_install_append() {
- install -d ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include
- ln -sf ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/${BINV}/include/
+ install -d ${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/${BINV}/include
+ ln -sf ${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/${BINV}/include-fixed/* ${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/${BINV}/include/
}
diff --git a/recipes/gcc/gcc-cross-kernel.inc b/recipes/gcc/gcc-cross-kernel.inc
index e6f1fb8..e9b9d7d 100644
--- a/recipes/gcc/gcc-cross-kernel.inc
+++ b/recipes/gcc/gcc-cross-kernel.inc
@@ -19,5 +19,5 @@ do_compile () {
do_stage () {
cd gcc
oe_runmake installdirs install-common install-headers install-libgcc
- install -m 0755 xgcc ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gcc-${PV}
+ install -m 0755 xgcc ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gcc-${PV}
}
diff --git a/recipes/gcc/gcc-cross-sdk_3.4.4.bb b/recipes/gcc/gcc-cross-sdk_3.4.4.bb
index a885c07..bb07bd3 100644
--- a/recipes/gcc/gcc-cross-sdk_3.4.4.bb
+++ b/recipes/gcc/gcc-cross-sdk_3.4.4.bb
@@ -7,7 +7,7 @@ SRC_URI += 'file://sdk-libstdc++-includes.patch'
do_compile_prepend () {
mkdir -p gcc
- ln -s ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}as gcc/as
- ln -s ${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}ld gcc/ld
+ ln -s ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}as gcc/as
+ ln -s ${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ld gcc/ld
}
diff --git a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
index 70c869e..c155fc2 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2007q3.bb
@@ -14,9 +14,9 @@ LDFLAGS = ""
# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
do_compile_prepend() {
- ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
- ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
- ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
}
diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
index 7ed0f51..11f6aff 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q1.bb
@@ -14,9 +14,9 @@ LDFLAGS = ""
# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
do_compile_prepend() {
- ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
- ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
- ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
}
diff --git a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
index 9ada568..c3d1af8 100644
--- a/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
+++ b/recipes/gcc/gcc-cross_csl-arm-2008q3.bb
@@ -14,9 +14,9 @@ LDFLAGS = ""
# staging-linkage and cross-linkage recipes don't work anymore, so do it by hand for this backwards CSL toolchain
do_compile_prepend() {
- ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
- ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
- ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}${target_libdir}/crt*.o ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}${target_libdir}/ld-* ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
+ ln -sf ${STAGING_DIR_TARGET}/lib/libc* ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/
sed -i -e 's:gcc_no_link=yes:gcc_no_link=no:' ${S}/libstdc++-v3/configure
}
diff --git a/recipes/gcc/gcc-package-cross.inc b/recipes/gcc/gcc-package-cross.inc
index 6978340..0c4ea2d 100644
--- a/recipes/gcc/gcc-package-cross.inc
+++ b/recipes/gcc/gcc-package-cross.inc
@@ -38,12 +38,12 @@ do_install () {
# Link gfortran to g77 to satisfy not-so-smart configure or hard coded g77
# gfortran is fully backwards compatible. This is a safe and practical solution.
- if [ -f ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}gfortran ]; then
+ if [ -f ${D}${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}gfortran ]; then
currdir="$PWD"
- cd ${D}${STAGING_DIR_NATIVE}${prefix_native}/bin/
+ cd ${D}${TOOLCHAIN_PATH}/bin/
ln -sf ${TARGET_PREFIX}gfortran ${TARGET_PREFIX}g77 || true
- if [ -d ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/ ] ; then
- cd ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin/
+ if [ -d ${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/ ] ; then
+ cd ${TOOLCHAIN_PATH}/${TARGET_SYS}/bin/
ln -sf gfortran g77 || true
fi
cd $currdir
--
1.7.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 4/5] recipes: Fix the PATHs for toolchains.
2010-07-31 5:34 [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Khem Raj
` (2 preceding siblings ...)
2010-07-31 5:34 ` [PATCH 3/5] gcc, eglibc: Use the paths for mutli-machine safe toolchain install Khem Raj
@ 2010-07-31 5:34 ` Khem Raj
2010-07-31 5:34 ` [PATCH 5/5] mpfr_3.0.0.bb: Override needs to be thumb instead of armv4t Khem Raj
` (2 subsequent siblings)
6 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2010-07-31 5:34 UTC (permalink / raw)
To: openembedded-devel
* Look into the new multi-machine friendly installation.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/apex/apex-env_1.5.14.bb | 6 +++---
recipes/apex/apex-env_1.5.8.bb | 6 +++---
recipes/apex/apex-nslu2-16mb_1.5.14.bb | 6 +++---
recipes/apex/apex-nslu2_1.5.14.bb | 6 +++---
recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb | 18 +++++++++---------
recipes/avr-libc/avr-libc_1.0.3.bb | 2 +-
recipes/bl/bl_cvs.bb | 2 +-
recipes/chromium/chromium_svn.bb | 2 +-
recipes/dejagnu/dejagnu-qemu_1.0.bb | 2 +-
recipes/dietlibc/dietlibc.inc | 4 ++--
recipes/emacs/emacs.inc | 10 +++++-----
recipes/emacs/emacs_cvs.bb | 6 +++---
recipes/gstreamer/gst-ffmpeg_0.10.10.bb | 2 +-
recipes/gstreamer/gst-ffmpeg_0.10.2.bb | 2 +-
recipes/gstreamer/gst-ffmpeg_0.10.4.bb | 2 +-
recipes/gstreamer/gst-ffmpeg_0.10.6.bb | 2 +-
recipes/gstreamer/gst-ffmpeg_0.10.7.bb | 2 +-
recipes/gstreamer/gst-ffmpeg_0.10.8.bb | 2 +-
recipes/iphone/gcc-iphone-cross_git.bb | 4 ++--
recipes/klibc/klibc.inc | 2 +-
recipes/led/led_cvs.bb | 2 +-
recipes/mamona/binutils-noemu_2.17.50.0.5.bb | 2 +-
recipes/meta/cross-linkage_1.0.bb | 18 +++++++++---------
recipes/musicbrainz/libmusicbrainz.inc | 2 +-
recipes/openmoko2/openmoko-browser2_svn.bb | 2 +-
recipes/perl/perl_5.10.1.bb | 2 +-
recipes/perl/perl_5.8.8.bb | 2 +-
recipes/phoneme/phoneme-advanced.inc | 2 +-
recipes/qi/qi.inc | 2 +-
recipes/uclibc/bfin-uclibc_svn.bb | 2 +-
recipes/wvstreams/wvstreams_4.2.2.bb | 2 +-
recipes/wvstreams/wvstreams_4.4.1.bb | 2 +-
recipes/wvstreams/wvstreams_4.6.bb | 2 +-
33 files changed, 65 insertions(+), 65 deletions(-)
diff --git a/recipes/apex/apex-env_1.5.14.bb b/recipes/apex/apex-env_1.5.14.bb
index cb44bd5..38a8960 100644
--- a/recipes/apex/apex-env_1.5.14.bb
+++ b/recipes/apex/apex-env_1.5.14.bb
@@ -10,11 +10,11 @@ SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
"
S = ${WORKDIR}/apex-${PV}/usr
-EXTRA_OEMAKE_append = " CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${HOST_PREFIX}"
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${HOST_PREFIX}"
oe_runmake() {
- oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} "$@"
- make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
}
do_install() {
diff --git a/recipes/apex/apex-env_1.5.8.bb b/recipes/apex/apex-env_1.5.8.bb
index d2cf0b7..d10e018 100644
--- a/recipes/apex/apex-env_1.5.8.bb
+++ b/recipes/apex/apex-env_1.5.8.bb
@@ -10,11 +10,11 @@ SRC_URI = "ftp://ftp.buici.com/pub/apex/apex-${PV}.tar.gz \
"
S = ${WORKDIR}/apex-${PV}/usr
-EXTRA_OEMAKE_append = " CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${HOST_PREFIX}"
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${HOST_PREFIX}"
oe_runmake() {
- oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} "$@"
- make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
}
do_install() {
diff --git a/recipes/apex/apex-nslu2-16mb_1.5.14.bb b/recipes/apex/apex-nslu2-16mb_1.5.14.bb
index 4d19f9e..8de194f 100644
--- a/recipes/apex/apex-nslu2-16mb_1.5.14.bb
+++ b/recipes/apex/apex-nslu2-16mb_1.5.14.bb
@@ -17,11 +17,11 @@ CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
CMDLINE_DEBUG ?= ""
-EXTRA_OEMAKE_append = " CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${HOST_PREFIX}"
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${HOST_PREFIX}"
oe_runmake() {
- oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} "$@"
- make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
}
# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head
diff --git a/recipes/apex/apex-nslu2_1.5.14.bb b/recipes/apex/apex-nslu2_1.5.14.bb
index 2bea9e2..06c672a 100644
--- a/recipes/apex/apex-nslu2_1.5.14.bb
+++ b/recipes/apex/apex-nslu2_1.5.14.bb
@@ -17,11 +17,11 @@ CMDLINE_ROOT ?= "root=/dev/mtdblock4 rootfstype=jffs2 rw"
CMDLINE_DEBUG ?= ""
-EXTRA_OEMAKE_append = " CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${HOST_PREFIX}"
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${HOST_PREFIX}"
oe_runmake() {
- oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} "$@"
- make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} "$@"
+ make ${PARALLEL_MAKE} LDFLAGS= CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} "$@" || die "oe_runmake failed"
}
# Set the correct CONFIG_USER_xxx_ENDIAN and CONFIG_CMDLINE at the head
diff --git a/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb b/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb
index 40bf8e9..a71a2f6 100644
--- a/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb
+++ b/recipes/arm-kernel-shim/arm-kernel-shim_1.5.bb
@@ -27,7 +27,7 @@ CMDLINE_ROOT_NAS100D = "root=/dev/mtdblock2 rootfstype=jffs2 rootflags=noatime r
CMDLINE_ROOT_NSLU2 = "root=/dev/mtdblock4 rootfstype=jffs2 rootflags=noatime rw init=/linuxrc"
# CMDLINE is passed correctly on the Freecom FSG-3 from the bootloader.
-EXTRA_OEMAKE_append = " CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${HOST_PREFIX}"
+EXTRA_OEMAKE_append = " CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${HOST_PREFIX}"
oe_runmake() {
mv ${S}/config.h ${S}/config.h.orig
@@ -41,8 +41,8 @@ oe_runmake() {
fi
echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_NSLU2} ${CMDLINE_DEBUG}\"" >> ${S}/config.h
rm -f ${S}/main.o
- oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
- make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nslu2 || die "oe_runmake failed"
# NAS100d
if [ ${SITEINFO_ENDIANNESS} == "be" ] ; then
sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
@@ -53,8 +53,8 @@ oe_runmake() {
fi
echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_NAS100D} ${CMDLINE_DEBUG}\"" >> ${S}/config.h
rm -f ${S}/main.o
- oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
- make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-nas100d || die "oe_runmake failed"
# DSMG-600
if [ ${SITEINFO_ENDIANNESS} == "be" ] ; then
sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
@@ -65,8 +65,8 @@ oe_runmake() {
fi
echo "#define COMMANDLINE \"${CMDLINE_CONSOLE} ${CMDLINE_ROOT_DSMG600} ${CMDLINE_DEBUG}\"" >> ${S}/config.h
rm -f ${S}/main.o
- oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
- make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-dsmg600 || die "oe_runmake failed"
# FSG-3
if [ ${SITEINFO_ENDIANNESS} == "be" ] ; then
sed -e 's|//#define FORCE_BIGENDIAN|#define FORCE_BIGENDIAN|' \
@@ -76,8 +76,8 @@ oe_runmake() {
${WORKDIR}/config-fsg3.h > ${S}/config.h
fi
rm -f ${S}/main.o
- oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
- make ${PARALLEL_MAKE} CROSS_COMPILE=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
+ oenote make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3
+ make ${PARALLEL_MAKE} CROSS_COMPILE=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX} PACKAGE=arm-kernel-shim-fsg3 || die "oe_runmake failed"
mv ${S}/config.h.orig ${S}/config.h
}
diff --git a/recipes/avr-libc/avr-libc_1.0.3.bb b/recipes/avr-libc/avr-libc_1.0.3.bb
index efd2967..22a7ed9 100644
--- a/recipes/avr-libc/avr-libc_1.0.3.bb
+++ b/recipes/avr-libc/avr-libc_1.0.3.bb
@@ -18,7 +18,7 @@ B = "${WORKDIR}/build.${BUILD_SYS}.${TARGET_SYS}"
inherit autotools
export tooldir = "${prefix}"
-prefix = "${STAGING_DIR_NATIVE}${prefix_native}"
+prefix = "${TOOLCHAIN_PATH}"
exec_prefix = "${prefix}"
do_stage () {
diff --git a/recipes/bl/bl_cvs.bb b/recipes/bl/bl_cvs.bb
index 779ff1e..0ec705b 100644
--- a/recipes/bl/bl_cvs.bb
+++ b/recipes/bl/bl_cvs.bb
@@ -21,7 +21,7 @@ do_configure (){
}
do_compile (){
- oe_runmake bl CC="${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}-gcc -I{STAGING_INCDIR} -L${STAGING_LIBDIR}" AS=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}-as LD=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}-ld
+ oe_runmake bl CC="${TOOLCHAIN_PATH}/bin/${TARGET_SYS}-gcc -I{STAGING_INCDIR} -L${STAGING_LIBDIR}" AS=${TOOLCHAIN_PATH}/bin/${TARGET_SYS}-as LD=${TOOLCHAIN_PATH}/bin/${TARGET_SYS}-ld
}
do_install () {
diff --git a/recipes/chromium/chromium_svn.bb b/recipes/chromium/chromium_svn.bb
index 6aeab44..5576c79 100644
--- a/recipes/chromium/chromium_svn.bb
+++ b/recipes/chromium/chromium_svn.bb
@@ -100,7 +100,7 @@ TARGET_CC_ARCH += "${LDFLAGS}"
do_compile() {
cd ${S}
- export CROSSTOOL=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}
+ export CROSSTOOL=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}
export AR=${CROSSTOOL}ar
export AS=${CROSSTOOL}as
export RANLIB=${CROSSTOOL}ranlib
diff --git a/recipes/dejagnu/dejagnu-qemu_1.0.bb b/recipes/dejagnu/dejagnu-qemu_1.0.bb
index 89cea80..16a204d 100644
--- a/recipes/dejagnu/dejagnu-qemu_1.0.bb
+++ b/recipes/dejagnu/dejagnu-qemu_1.0.bb
@@ -13,7 +13,7 @@ do_stage() {
install -m 0644 ${WORKDIR}/arm-qemu.exp ${STAGING_DATADIR}/dejagnu/baseboards/
cat <<EOF >${STAGING_BINDIR_NATIVE}/${QEMU}-test-wrapper
#!/bin/sh
-exec ${QEMU} ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/${LD_SO} --library-path ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib:${STAGING_DIR_TARGET}${layout_libdir} \$1
+exec ${QEMU} ${TOOLCHAIN_PATH}/${TARGET_SYS}/${LD_SO} --library-path ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib:${STAGING_DIR_TARGET}${layout_libdir} \$1
EOF
chmod 755 ${STAGING_BINDIR_NATIVE}/arm-qemu-test-wrapper
}
diff --git a/recipes/dietlibc/dietlibc.inc b/recipes/dietlibc/dietlibc.inc
index a1537e1..64bc6be 100644
--- a/recipes/dietlibc/dietlibc.inc
+++ b/recipes/dietlibc/dietlibc.inc
@@ -29,12 +29,12 @@ do_stage () {
DIETLIBC_BUILD_ARCH=`echo ${BUILD_ARCH} | sed -e s'/.86/386/'`
DIETLIBC_TARGET_ARCH=`echo ${TARGET_ARCH} | sed -e s'/.86/386/'`
rm -rf ${STAGING_DIR_TARGET}/lib/dietlibc || true
- rm ${STAGING_DIR_NATIVE}${prefix_native}/bin/diet || true
+ rm ${TOOLCHAIN_PATH}/bin/diet || true
install -d ${STAGING_DIR_TARGET}/lib/dietlibc/lib-${DIETLIBC_TARGET_ARCH}
install -d ${STAGING_DIR_TARGET}/lib/dietlibc/include
for i in `find include -name \*.h`; do install -m 644 -D $i ${STAGING_DIR_TARGET}/lib/dietlibc/$i; done
- install -m755 bin-${DIETLIBC_BUILD_ARCH}/diet-i ${STAGING_DIR_NATIVE}${prefix_native}/bin/diet
+ install -m755 bin-${DIETLIBC_BUILD_ARCH}/diet-i ${TOOLCHAIN_PATH}/bin/diet
cd bin-${DIETLIBC_TARGET_ARCH}
install -m 644 start.o libm.a libpthread.a librpc.a \
diff --git a/recipes/emacs/emacs.inc b/recipes/emacs/emacs.inc
index 893ee9d..3db264e 100644
--- a/recipes/emacs/emacs.inc
+++ b/recipes/emacs/emacs.inc
@@ -32,7 +32,7 @@ export LOGNAME = "$(whoami)"
do_compile_prepend() {
sed -i ':1;s:\(START.* \|LIB_STANDARD.* \|LIBES.* \)/usr/lib:\1${STAGING_LIBDIR}:;t1' ${S}/src/s/gnu-linux.h `find "${S}" -name Makefile`
- export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib"
+ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
# Ugly hack, see files/use-qemu.patch for more:
ln -sf ../src/emacs lisp/emacs
ln -sf ../src/emacs lib-src/emacs
@@ -44,11 +44,11 @@ do_compile_prepend() {
fi
mkdir $treedir
cp -pPR ${STAGING_DIR_TARGET}/* $treedir
- if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so ]; then
- cp -pPR ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
+ if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so ]; then
+ cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so $treedir/lib
fi
- if [ -f ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
- cp -pPR ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
+ if [ -f ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.* ]; then
+ cp -pPR ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.* $treedir/lib
fi
# stupid hack, but without it, it tries to use /usr/lib/libc.so from host and fails
# temacs: error while loading shared libraries: /usr/lib/libc.so: ELF file version does not match current one
diff --git a/recipes/emacs/emacs_cvs.bb b/recipes/emacs/emacs_cvs.bb
index a2065be..8ffc22f 100644
--- a/recipes/emacs/emacs_cvs.bb
+++ b/recipes/emacs/emacs_cvs.bb
@@ -27,12 +27,12 @@ FILES_${PN}-el = "${datadir}/emacs/*/*/*.el.gz \
FILES_${PN} += "${datadir}/emacs"
QEMU = "qemu-${TARGET_ARCH} -L ${STAGING_DIR_TARGET}"
-LDFLAGS += "-L${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib"
+LDFLAGS += "-L${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
EXTRA_OECONF = "--without-sound --without-x"
do_bootstrap() {
- cp "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
+ cp "${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}"
export QEMU="${QEMU}"
@@ -46,7 +46,7 @@ do_bootstrap() {
addtask bootstrap before do_compile after do_configure
do_compile_prepend() {
- cp "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
+ cp "${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/libgcc_s.so.1" "${S}"
export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:${S}"
export QEMU="${QEMU}"
}
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.10.bb b/recipes/gstreamer/gst-ffmpeg_0.10.10.bb
index d2b6901..0952683 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.10.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.10.bb
@@ -24,7 +24,7 @@ EXTRA_OECONF = " --with-system-ffmpeg "
# We do this because the install program is called with -s which causes it to
# call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
+PATH_prepend="${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.2.bb b/recipes/gstreamer/gst-ffmpeg_0.10.2.bb
index f2c2654..2328b0d 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.2.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.2.bb
@@ -25,7 +25,7 @@ EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
# We do this because the install program is called with -s which causes it to
# call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
+PATH_prepend="${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.4.bb b/recipes/gstreamer/gst-ffmpeg_0.10.4.bb
index 28a753d..83ccdb5 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.4.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.4.bb
@@ -24,7 +24,7 @@ EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
# We do this because the install program is called with -s which causes it to
# call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
+PATH_prepend="${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.6.bb b/recipes/gstreamer/gst-ffmpeg_0.10.6.bb
index 9b8ec8d..c78b4c4 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.6.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.6.bb
@@ -25,7 +25,7 @@ EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
# We do this because the install program is called with -s which causes it to
# call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
+PATH_prepend="${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.7.bb b/recipes/gstreamer/gst-ffmpeg_0.10.7.bb
index 8a1d56e..a8bbbec 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.7.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.7.bb
@@ -25,7 +25,7 @@ EXTRA_OECONF = "--disable-sdltest --disable-ffplay --disable-freetypetest \
# We do this because the install program is called with -s which causes it to
# call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
+PATH_prepend="${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
diff --git a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb
index 0cd0ceb..5f92dcc 100644
--- a/recipes/gstreamer/gst-ffmpeg_0.10.8.bb
+++ b/recipes/gstreamer/gst-ffmpeg_0.10.8.bb
@@ -21,7 +21,7 @@ EXTRA_OECONF = " --with-system-ffmpeg "
# We do this because the install program is called with -s which causes it to
# call "strip" and it then mangles cross compiled stuff..
-PATH_prepend="${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin:"
+PATH_prepend="${TOOLCHAIN_PATH}/${TARGET_SYS}/bin:"
# Hack to get STAGING_LIBDIR into the linker path when building ffmpeg
CC = "${CCACHE} ${HOST_PREFIX}gcc ${TARGET_CC_ARCH} -L${STAGING_LIBDIR}"
diff --git a/recipes/iphone/gcc-iphone-cross_git.bb b/recipes/iphone/gcc-iphone-cross_git.bb
index 3c6a788..43f8b6b 100644
--- a/recipes/iphone/gcc-iphone-cross_git.bb
+++ b/recipes/iphone/gcc-iphone-cross_git.bb
@@ -20,8 +20,8 @@ EXTRA_OECONF = "\
--enable-sjlj-exceptions \
--enable-wchar_t=no \
--with-gxx-include-dir=${STAGING_DIR_TARGET}/${layout_includedir}/c++ \
- --with-as=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}as \
- --with-ld=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}ld \
+ --with-as=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}as \
+ --with-ld=${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}ld \
--with-sysroot=${STAGING_DIR_TARGET} \
--with-build-sysroot=${STAGING_DIR_TARGET} \
--with-local-prefix=${STAGING_DIR_TARGET}${layout_prefix} \
diff --git a/recipes/klibc/klibc.inc b/recipes/klibc/klibc.inc
index d0f8e1c..a40a45c 100644
--- a/recipes/klibc/klibc.inc
+++ b/recipes/klibc/klibc.inc
@@ -13,7 +13,7 @@ do_install() {
export INST=${STAGING_DIR_TARGET}
do_stage() {
oe_runmake install
- cp '${STAGING_DIR_TARGET}/bin/klcc' '${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_PREFIX}klcc'
+ cp '${STAGING_DIR_TARGET}/bin/klcc' '${TOOLCHAIN_PATH}/bin/${TARGET_PREFIX}klcc'
}
PACKAGES = "${PN} ${PN}-dev "
diff --git a/recipes/led/led_cvs.bb b/recipes/led/led_cvs.bb
index 90eb116..8fd0586 100644
--- a/recipes/led/led_cvs.bb
+++ b/recipes/led/led_cvs.bb
@@ -19,7 +19,7 @@ do_configure (){
}
do_compile (){
- oe_runmake led CC="${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}-gcc -I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/include -L${STAGING_LIBDIR}" AS=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}-as LD=${STAGING_DIR_NATIVE}${prefix_native}/bin/${TARGET_SYS}-ld
+ oe_runmake led CC="${TOOLCHAIN_PATH}/bin/${TARGET_SYS}-gcc -I${STAGING_INCDIR} -I${STAGING_KERNEL_DIR}/include -L${STAGING_LIBDIR}" AS=${TOOLCHAIN_PATH}/bin/${TARGET_SYS}-as LD=${TOOLCHAIN_PATH}/bin/${TARGET_SYS}-ld
}
do_install () {
diff --git a/recipes/mamona/binutils-noemu_2.17.50.0.5.bb b/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
index c3e2b31..73330c4 100644
--- a/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
+++ b/recipes/mamona/binutils-noemu_2.17.50.0.5.bb
@@ -16,7 +16,7 @@ SRC_URI = \
file://binutils-uclibc-300-012_check_ldrunpath_length.patch \
"
-EXTRA_OECONF = "--with-sysroot=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-sysroot=${TOOLCHAIN_PATH}/${TARGET_SYS} \
--program-prefix=${TARGET_PREFIX} --disable-shared"
HOST_SYS = "${BUILD_SYS}"
diff --git a/recipes/meta/cross-linkage_1.0.bb b/recipes/meta/cross-linkage_1.0.bb
index a5e456b..713e1fd 100644
--- a/recipes/meta/cross-linkage_1.0.bb
+++ b/recipes/meta/cross-linkage_1.0.bb
@@ -21,15 +21,15 @@ do_install() {
}
do_stage () {
- install -d ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/
- if [ -e ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/include ]; then
- cp -pPRr ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/include/* ${STAGING_INCDIR}
- mv ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/include/ ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/include-oldbackup
+ install -d ${TOOLCHAIN_PATH}/${TARGET_SYS}/
+ if [ -e ${TOOLCHAIN_PATH}/${TARGET_SYS}/include ]; then
+ cp -pPRr ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/* ${STAGING_INCDIR}
+ mv ${TOOLCHAIN_PATH}/${TARGET_SYS}/include/ ${TOOLCHAIN_PATH}/${TARGET_SYS}/include-oldbackup
fi
- ln -s ${STAGING_INCDIR}/ ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/include
- if [ -e ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib ]; then
- cp -pPRr ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/* ${STAGING_LIBDIR}
- mv ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib/ ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib-oldbackup
+ ln -s ${STAGING_INCDIR}/ ${TOOLCHAIN_PATH}/${TARGET_SYS}/include
+ if [ -e ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib ]; then
+ cp -pPRr ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/* ${STAGING_LIBDIR}
+ mv ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib/ ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib-oldbackup
fi
- ln -s ${STAGING_LIBDIR} ${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib
+ ln -s ${STAGING_LIBDIR} ${TOOLCHAIN_PATH}/${TARGET_SYS}/lib
}
diff --git a/recipes/musicbrainz/libmusicbrainz.inc b/recipes/musicbrainz/libmusicbrainz.inc
index 1838d4e..4d64ff3 100644
--- a/recipes/musicbrainz/libmusicbrainz.inc
+++ b/recipes/musicbrainz/libmusicbrainz.inc
@@ -10,7 +10,7 @@ SRC_URI = "ftp://ftp.musicbrainz.org/pub/musicbrainz/libmusicbrainz-${PV}.tar.gz
inherit cmake pkgconfig
# Fight a compiler/link bug that leaks too many c++ symbols
-TARGET_LDFLAGS += " -Wl,-rpath-link,${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib -ldl"
+TARGET_LDFLAGS += " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib -ldl"
do_stage() {
autotools_stage_all
diff --git a/recipes/openmoko2/openmoko-browser2_svn.bb b/recipes/openmoko2/openmoko-browser2_svn.bb
index a4d8164..4fb5699 100644
--- a/recipes/openmoko2/openmoko-browser2_svn.bb
+++ b/recipes/openmoko2/openmoko-browser2_svn.bb
@@ -6,7 +6,7 @@ PV = "0.0.1+svnr${SRCPV}"
PR = "r2"
inherit openmoko2
-LDFLAGS_append = " -Wl,-rpath-link,${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib"
+LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
SRC_URI += "file://webkit-update.patch;minrev=3646;maxrev=4171"
diff --git a/recipes/perl/perl_5.10.1.bb b/recipes/perl/perl_5.10.1.bb
index efd7cf3..c469cf9 100644
--- a/recipes/perl/perl_5.10.1.bb
+++ b/recipes/perl/perl_5.10.1.bb
@@ -131,7 +131,7 @@ do_install() {
-e "s,${STAGING_LIBDIR},${libdir},g" \
-e "s,${STAGING_BINDIR},${bindir},g" \
-e "s,${STAGING_INCDIR},${includedir},g" \
- -e "s,${STAGING_DIR_NATIVE}${prefix_native}${base_bindir}/,,g" \
+ -e "s,${TOOLCHAIN_PATH}${base_bindir}/,,g" \
${D}${bindir}/h2xs \
${D}${bindir}/h2ph \
${D}${datadir}/perl/${PV}/pod/*.pod \
diff --git a/recipes/perl/perl_5.8.8.bb b/recipes/perl/perl_5.8.8.bb
index bc6cc22..0b9135d 100644
--- a/recipes/perl/perl_5.8.8.bb
+++ b/recipes/perl/perl_5.8.8.bb
@@ -135,7 +135,7 @@ do_install() {
-e "s,${STAGING_LIBDIR},${libdir},g" \
-e "s,${STAGING_BINDIR},${bindir},g" \
-e "s,${STAGING_INCDIR},${includedir},g" \
- -e "s,${STAGING_DIR_NATIVE}${prefix_native}${base_bindir}/,,g" \
+ -e "s,${TOOLCHAIN_PATH}${base_bindir}/,,g" \
${D}${bindir}/h2xs \
${D}${bindir}/h2ph \
${D}${datadir}/perl/${PV}/pod/*.pod \
diff --git a/recipes/phoneme/phoneme-advanced.inc b/recipes/phoneme/phoneme-advanced.inc
index 9df61a6..be3ff92 100644
--- a/recipes/phoneme/phoneme-advanced.inc
+++ b/recipes/phoneme/phoneme-advanced.inc
@@ -66,7 +66,7 @@ do_configure() {
pmo "# Java toolchain binaries"
pmo JDK_HOME /dev/null
- pmo CVM_TARGET_TOOLS_PREFIX ${STAGING_DIR_NATIVE}${prefix_native}/bin/
+ pmo CVM_TARGET_TOOLS_PREFIX ${TOOLCHAIN_PATH}/bin/
pmo CVM_JAVA java
pmo CVM_JAVAC javac
pmo CVM_JAVADOC true
diff --git a/recipes/qi/qi.inc b/recipes/qi/qi.inc
index f9d4f2e..c4aadba 100644
--- a/recipes/qi/qi.inc
+++ b/recipes/qi/qi.inc
@@ -21,7 +21,7 @@ BUILD_DATE=\$(shell date --iso-8601=seconds)
# has been built. If it bails out with something like: "| arm-linux-ld: 4.3.3: No such file or directory"
# then you need to remove all previously built toolchain directories out of the cross library path.
GCCV="`${CC} -dumpversion`"
-COMPILER_LIB_PATH_PRE=${STAGING_DIR_NATIVE}${prefix_native}/lib/gcc/${TARGET_SYS}/$(GCCV)
+COMPILER_LIB_PATH_PRE=${TOOLCHAIN_PATH}/lib/gcc/${TARGET_SYS}/$(GCCV)
COMPILER_LIB_PATH=\$(COMPILER_LIB_PATH_PRE)/\$(shell ls \$(COMPILER_LIB_PATH_PRE))
AS=${AS}
diff --git a/recipes/uclibc/bfin-uclibc_svn.bb b/recipes/uclibc/bfin-uclibc_svn.bb
index 954d10d..dafd094 100644
--- a/recipes/uclibc/bfin-uclibc_svn.bb
+++ b/recipes/uclibc/bfin-uclibc_svn.bb
@@ -20,7 +20,7 @@ COMPATIBLE_HOST = "bfin.*-uclinux"
#as stated above, uclibc needs real kernel-headers
#however: we can't depend on virtual/kernel when nptl hits due to depends deadlocking ....
-KERNEL_SOURCE = "${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}"
+KERNEL_SOURCE = "${TOOLCHAIN_PATH}/${TARGET_SYS}"
SRC_URI = "svn://sources.blackfin.uclinux.org/toolchain/trunk;module=uClibc "
SRC_URI += "file://uClibc.machine file://uClibc.distro"
diff --git a/recipes/wvstreams/wvstreams_4.2.2.bb b/recipes/wvstreams/wvstreams_4.2.2.bb
index 4358ec1..8782790 100644
--- a/recipes/wvstreams/wvstreams_4.2.2.bb
+++ b/recipes/wvstreams/wvstreams_4.2.2.bb
@@ -12,7 +12,7 @@ SRC_URI = "http://ftp.de.debian.org/debian/pool/main/w/wvstreams/${PN}_${PV}.ori
inherit autotools pkgconfig
-LDFLAGS_append = " -Wl,-rpath-link,${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib"
+LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
EXTRA_AUTORECONF += " -I${S}/gnulib/m4"
EXTRA_OECONF = " --without-tcl --without-qt --without-pam"
diff --git a/recipes/wvstreams/wvstreams_4.4.1.bb b/recipes/wvstreams/wvstreams_4.4.1.bb
index 4506b05..f18f219 100644
--- a/recipes/wvstreams/wvstreams_4.4.1.bb
+++ b/recipes/wvstreams/wvstreams_4.4.1.bb
@@ -14,7 +14,7 @@ SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
inherit autotools pkgconfig
-LDFLAGS_append = " -Wl,-rpath-link,${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib"
+LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
EXTRA_AUTORECONF += " -I${S}/gnulib/m4"
EXTRA_OECONF = " --without-tcl --without-qt --without-pam"
diff --git a/recipes/wvstreams/wvstreams_4.6.bb b/recipes/wvstreams/wvstreams_4.6.bb
index eb70fd2..a6d2c26 100644
--- a/recipes/wvstreams/wvstreams_4.6.bb
+++ b/recipes/wvstreams/wvstreams_4.6.bb
@@ -8,7 +8,7 @@ SRC_URI = "http://wvstreams.googlecode.com/files/${PN}-${PV}.tar.gz \
inherit autotools pkgconfig
-LDFLAGS_append = " -Wl,-rpath-link,${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/lib"
+LDFLAGS_append = " -Wl,-rpath-link,${TOOLCHAIN_PATH}/${TARGET_SYS}/lib"
EXTRA_OECONF = " --without-tcl --without-qt --without-pam"
--
1.7.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* [PATCH 5/5] mpfr_3.0.0.bb: Override needs to be thumb instead of armv4t
2010-07-31 5:34 [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Khem Raj
` (3 preceding siblings ...)
2010-07-31 5:34 ` [PATCH 4/5] recipes: Fix the PATHs for toolchains Khem Raj
@ 2010-07-31 5:34 ` Khem Raj
2010-07-31 9:48 ` [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Koen Kooi
2010-08-01 15:48 ` Eric Bénard
6 siblings, 0 replies; 22+ messages in thread
From: Khem Raj @ 2010-07-31 5:34 UTC (permalink / raw)
To: openembedded-devel
* This covers the case when compiling with thumb mode
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
recipes/mpfr/mpfr_3.0.0.bb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/mpfr/mpfr_3.0.0.bb b/recipes/mpfr/mpfr_3.0.0.bb
index 6ad2a29..1abccd6 100644
--- a/recipes/mpfr/mpfr_3.0.0.bb
+++ b/recipes/mpfr/mpfr_3.0.0.bb
@@ -3,14 +3,14 @@ require mpfr.inc
DEPENDS = "gmp"
S = "${WORKDIR}/mpfr-${PV}"
NATIVE_INSTALL_WORKS = "1"
-PR = "r1"
+PR = "r2"
BBCLASSEXTEND = "native"
SRC_URI = "http://www.mpfr.org/mpfr-${PV}/mpfr-${PV}.tar.bz2 \
file://p3.patch"
# fix build in thumb mode for armv4t
-SRC_URI_append_armv4t = " file://long-long-thumb.patch"
+SRC_URI_append_thumb = " file://long-long-thumb.patch"
SRC_URI[md5sum] = "f45bac3584922c8004a10060ab1a8f9f"
SRC_URI[sha256sum] = "8f4e5f9c53536cb798a30455ac429b1f9fc75a0f8af32d6e0ac31ebf1024821f"
--
1.7.1
^ permalink raw reply related [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-07-31 5:34 [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Khem Raj
` (4 preceding siblings ...)
2010-07-31 5:34 ` [PATCH 5/5] mpfr_3.0.0.bb: Override needs to be thumb instead of armv4t Khem Raj
@ 2010-07-31 9:48 ` Koen Kooi
2010-07-31 13:34 ` Koen Kooi
2010-08-01 15:48 ` Eric Bénard
6 siblings, 1 reply; 22+ messages in thread
From: Koen Kooi @ 2010-07-31 9:48 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 31-07-10 07:34, Khem Raj wrote:
> Hi
>
> Following series of patches are for making multi-machine toolchains co-exist with
> new cross staging for toolchain.
>
> It installs the toolchain in <native sysroot>/usr/${BASE_PACKAGE_ARCH}
> this way we can have multiple toolchains co-existing for different sub-arches and major arches too.
>
> I have booted a native-sdk-image on qemuarm successfully. The build for
> beagleboard minimal image using different versions of toolchain went all fine too.
>
> Please test these patches and if seem ok provide some ACKS/NACKS
Khem, thanks for working on this!
Firing of a build now :)
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMU/GLMkyGM64RGpERAgsUAJ9pEYviFZX/DHvDnn5wYGPIpo45NACfZyYx
ieovJk3ReBYIiOcjRfJwy3g=
=YCE/
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-07-31 9:48 ` [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Koen Kooi
@ 2010-07-31 13:34 ` Koen Kooi
2010-07-31 18:54 ` Koen Kooi
0 siblings, 1 reply; 22+ messages in thread
From: Koen Kooi @ 2010-07-31 13:34 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 31-07-10 11:48, Koen Kooi wrote:
> On 31-07-10 07:34, Khem Raj wrote:
>> Hi
>
>> Following series of patches are for making multi-machine toolchains co-exist with
>> new cross staging for toolchain.
>
>> It installs the toolchain in <native sysroot>/usr/${BASE_PACKAGE_ARCH}
>> this way we can have multiple toolchains co-existing for different sub-arches and major arches too.
>
>> I have booted a native-sdk-image on qemuarm successfully. The build for
>> beagleboard minimal image using different versions of toolchain went all fine too.
>
>> Please test these patches and if seem ok provide some ACKS/NACKS
>
> Khem, thanks for working on this!
>
> Firing of a build now :)
'MACHINE=beagleboard bitbake ffmpeg samba mysql5 gstreamer-ti' completed
succesfully, doing a 'MACHINE=hawkboard bitbake gtk+' now.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMVCZgMkyGM64RGpERAonjAJ0QQxHuCqlZf3lqoR+e1fig4sPCVACfQvaX
mx2oVhRM1EgoVscNsq3L/Ko=
=tXH5
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-07-31 13:34 ` Koen Kooi
@ 2010-07-31 18:54 ` Koen Kooi
2010-08-02 9:33 ` Koen Kooi
0 siblings, 1 reply; 22+ messages in thread
From: Koen Kooi @ 2010-07-31 18:54 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 31-07-10 15:34, Koen Kooi wrote:
> On 31-07-10 11:48, Koen Kooi wrote:
>> On 31-07-10 07:34, Khem Raj wrote:
>>> Hi
>
>>> Following series of patches are for making multi-machine toolchains co-exist with
>>> new cross staging for toolchain.
>
>>> It installs the toolchain in <native sysroot>/usr/${BASE_PACKAGE_ARCH}
>>> this way we can have multiple toolchains co-existing for different sub-arches and major arches too.
>
>>> I have booted a native-sdk-image on qemuarm successfully. The build for
>>> beagleboard minimal image using different versions of toolchain went all fine too.
>
>>> Please test these patches and if seem ok provide some ACKS/NACKS
>
>> Khem, thanks for working on this!
>
>> Firing of a build now :)
>
> 'MACHINE=beagleboard bitbake ffmpeg samba mysql5 gstreamer-ti' completed
> succesfully, doing a 'MACHINE=hawkboard bitbake gtk+' now.
And that seems to have worked as well. I have kicked of a huge
multimachine build on the 16core buildserver at work and will inspect
the results on monday. But so far it's looking really good.
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMVHFwMkyGM64RGpERAnYvAJ9nQgu0DyHWxb+UwmfDavSWgXlf0QCgsevW
mSjAqZyvmUQN4UtSQOFnY/w=
=J9TV
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-07-31 5:34 [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Khem Raj
` (5 preceding siblings ...)
2010-07-31 9:48 ` [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Koen Kooi
@ 2010-08-01 15:48 ` Eric Bénard
6 siblings, 0 replies; 22+ messages in thread
From: Eric Bénard @ 2010-08-01 15:48 UTC (permalink / raw)
To: openembedded-devel
Hi Khem,
Le 31/07/2010 07:34, Khem Raj a écrit :
> Following series of patches are for making multi-machine toolchains co-exist with
> new cross staging for toolchain.
>
> It installs the toolchain in<native sysroot>/usr/${BASE_PACKAGE_ARCH}
> this way we can have multiple toolchains co-existing for different sub-arches and major arches too.
>
> I have booted a native-sdk-image on qemuarm successfully. The build for
> beagleboard minimal image using different versions of toolchain went all fine too.
>
> Please test these patches and if seem ok provide some ACKS/NACKS
>
here is the result of my tests :
* distro Angstrom for armv5 and armv6 machines : several images & sdk
are built fine (but not tested)
* distro minimal for armv4 and armv5 machines : several images & sdk are
built fine (but not tested)
Eric
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-07-31 18:54 ` Koen Kooi
@ 2010-08-02 9:33 ` Koen Kooi
2010-08-02 16:27 ` Khem Raj
0 siblings, 1 reply; 22+ messages in thread
From: Koen Kooi @ 2010-08-02 9:33 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 31-07-10 20:54, Koen Kooi wrote:
> On 31-07-10 15:34, Koen Kooi wrote:
>> On 31-07-10 11:48, Koen Kooi wrote:
>>> On 31-07-10 07:34, Khem Raj wrote:
>>>> Hi
>
>>>> Following series of patches are for making multi-machine toolchains co-exist with
>>>> new cross staging for toolchain.
>
>>>> It installs the toolchain in <native sysroot>/usr/${BASE_PACKAGE_ARCH}
>>>> this way we can have multiple toolchains co-existing for different sub-arches and major arches too.
>
>>>> I have booted a native-sdk-image on qemuarm successfully. The build for
>>>> beagleboard minimal image using different versions of toolchain went all fine too.
>
>>>> Please test these patches and if seem ok provide some ACKS/NACKS
>
>>> Khem, thanks for working on this!
>
>>> Firing of a build now :)
>
>> 'MACHINE=beagleboard bitbake ffmpeg samba mysql5 gstreamer-ti' completed
>> succesfully, doing a 'MACHINE=hawkboard bitbake gtk+' now.
>
> And that seems to have worked as well. I have kicked of a huge
> multimachine build on the 16core buildserver at work and will inspect
> the results on monday. But so far it's looking really good.
The multimachine build finished as well. Before I ack this patch, are we
going to match the OE layout to the one used in poky?
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMVpD2MkyGM64RGpERAsK8AJwMVi7zfHWt07AbegVk0MRvp4oMAgCaApKK
ADTLyDOwp79gCsVC1tV//mI=
=f9PZ
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-02 9:33 ` Koen Kooi
@ 2010-08-02 16:27 ` Khem Raj
2010-08-03 10:13 ` Koen Kooi
0 siblings, 1 reply; 22+ messages in thread
From: Khem Raj @ 2010-08-02 16:27 UTC (permalink / raw)
To: openembedded-devel
On Mon, Aug 2, 2010 at 2:33 AM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 31-07-10 20:54, Koen Kooi wrote:
>> On 31-07-10 15:34, Koen Kooi wrote:
>>> On 31-07-10 11:48, Koen Kooi wrote:
>>>> On 31-07-10 07:34, Khem Raj wrote:
>>>>> Hi
>>
>>>>> Following series of patches are for making multi-machine toolchains co-exist with
>>>>> new cross staging for toolchain.
>>
>>>>> It installs the toolchain in <native sysroot>/usr/${BASE_PACKAGE_ARCH}
>>>>> this way we can have multiple toolchains co-existing for different sub-arches and major arches too.
>>
>>>>> I have booted a native-sdk-image on qemuarm successfully. The build for
>>>>> beagleboard minimal image using different versions of toolchain went all fine too.
>>
>>>>> Please test these patches and if seem ok provide some ACKS/NACKS
>>
>>>> Khem, thanks for working on this!
>>
>>>> Firing of a build now :)
>>
>>> 'MACHINE=beagleboard bitbake ffmpeg samba mysql5 gstreamer-ti' completed
>>> succesfully, doing a 'MACHINE=hawkboard bitbake gtk+' now.
>>
>> And that seems to have worked as well. I have kicked of a huge
>> multimachine build on the 16core buildserver at work and will inspect
>> the results on monday. But so far it's looking really good.
>
> The multimachine build finished as well. Before I ack this patch, are we
> going to match the OE layout to the one used in poky?
I think the layout we have is nice because it still keeps the cross
bits somewhat
and lets relocatable class to fudge the rpath and we are in native sysroot.
and <sysroot>/usr/armv5te/bin looks a bit better than
<sysroot>/usr/bin/armv5te/bin
>
> regards,
>
> Koen
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
>
> iD8DBQFMVpD2MkyGM64RGpERAsK8AJwMVi7zfHWt07AbegVk0MRvp4oMAgCaApKK
> ADTLyDOwp79gCsVC1tV//mI=
> =f9PZ
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-02 16:27 ` Khem Raj
@ 2010-08-03 10:13 ` Koen Kooi
2010-08-03 10:21 ` Martin Jansa
` (2 more replies)
0 siblings, 3 replies; 22+ messages in thread
From: Koen Kooi @ 2010-08-03 10:13 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Acked-by: Koen Kooi <k-kooi@ti.com>
If noone objects, can we get this in ASAP?
On 02-08-10 18:27, Khem Raj wrote:
> On Mon, Aug 2, 2010 at 2:33 AM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
> On 31-07-10 20:54, Koen Kooi wrote:
>>>> On 31-07-10 15:34, Koen Kooi wrote:
>>>>> On 31-07-10 11:48, Koen Kooi wrote:
>>>>>> On 31-07-10 07:34, Khem Raj wrote:
>>>>>>> Hi
>>>>
>>>>>>> Following series of patches are for making multi-machine toolchains co-exist with
>>>>>>> new cross staging for toolchain.
>>>>
>>>>>>> It installs the toolchain in <native sysroot>/usr/${BASE_PACKAGE_ARCH}
>>>>>>> this way we can have multiple toolchains co-existing for different sub-arches and major arches too.
>>>>
>>>>>>> I have booted a native-sdk-image on qemuarm successfully. The build for
>>>>>>> beagleboard minimal image using different versions of toolchain went all fine too.
>>>>
>>>>>>> Please test these patches and if seem ok provide some ACKS/NACKS
>>>>
>>>>>> Khem, thanks for working on this!
>>>>
>>>>>> Firing of a build now :)
>>>>
>>>>> 'MACHINE=beagleboard bitbake ffmpeg samba mysql5 gstreamer-ti' completed
>>>>> succesfully, doing a 'MACHINE=hawkboard bitbake gtk+' now.
>>>>
>>>> And that seems to have worked as well. I have kicked of a huge
>>>> multimachine build on the 16core buildserver at work and will inspect
>>>> the results on monday. But so far it's looking really good.
>
> The multimachine build finished as well. Before I ack this patch, are we
> going to match the OE layout to the one used in poky?
>
>> I think the layout we have is nice because it still keeps the cross
>> bits somewhat
>> and lets relocatable class to fudge the rpath and we are in native sysroot.
>> and <sysroot>/usr/armv5te/bin looks a bit better than
>> <sysroot>/usr/bin/armv5te/bin
>
>
> regards,
>
> Koen
>>
>>
_______________________________________________
Openembedded-devel mailing list
Openembedded-devel@lists.openembedded.org
http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMV+vmMkyGM64RGpERAr53AJ9tDqQpQsYNI8ghsSZ/Jq6od6IilwCeJ9Cf
GEp6+dnTlLtFyDcANsrx6lo=
=dAXV
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 10:13 ` Koen Kooi
@ 2010-08-03 10:21 ` Martin Jansa
2010-08-03 10:29 ` Andrea Adami
2010-08-03 10:31 ` Frans Meulenbroeks
2010-08-03 13:35 ` Martin Jansa
2 siblings, 1 reply; 22+ messages in thread
From: Martin Jansa @ 2010-08-03 10:21 UTC (permalink / raw)
To: openembedded-devel
On Tue, Aug 03, 2010 at 12:13:58PM +0200, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Acked-by: Koen Kooi <k-kooi@ti.com>
> If noone objects, can we get this in ASAP?
We're using it for multimachine SHR builds too and seems to work OK.
whole serie:
Acked-by: Martin Jansa <Martin.Jansa@gmail.com>
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 10:21 ` Martin Jansa
@ 2010-08-03 10:29 ` Andrea Adami
0 siblings, 0 replies; 22+ messages in thread
From: Andrea Adami @ 2010-08-03 10:29 UTC (permalink / raw)
To: openembedded-devel
Yes, seems working here (Angstrom armv5te + armv4 builds)
There is just a small glitch (broken symlink g77->gfortran).
Khem will solve it.
http://pastebin.com/BcjUTa9g
Regards
Andrea
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 10:13 ` Koen Kooi
2010-08-03 10:21 ` Martin Jansa
@ 2010-08-03 10:31 ` Frans Meulenbroeks
2010-08-03 13:35 ` Martin Jansa
2 siblings, 0 replies; 22+ messages in thread
From: Frans Meulenbroeks @ 2010-08-03 10:31 UTC (permalink / raw)
To: openembedded-devel
2010/8/3 Koen Kooi <k.kooi@student.utwente.nl>
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Acked-by: Koen Kooi <k-kooi@ti.com>
>
> If noone objects, can we get this in ASAP?
>
> Would it be good to do my do_stage patch first?
rationale:
this will require a full rebuild. the do_stage patch does not bump PR (which
is technically probably not needed as nothing changes).
By doing it just before a major change we are sure that it gets rebuild.
However, I cannot apply my patch in the next 6-7 hrs. Feel free to apply it
for me.
Frans.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 10:13 ` Koen Kooi
2010-08-03 10:21 ` Martin Jansa
2010-08-03 10:31 ` Frans Meulenbroeks
@ 2010-08-03 13:35 ` Martin Jansa
2010-08-03 15:36 ` Koen Kooi
2010-08-03 19:56 ` Khem Raj
2 siblings, 2 replies; 22+ messages in thread
From: Martin Jansa @ 2010-08-03 13:35 UTC (permalink / raw)
To: openembedded-devel
On Tue, Aug 03, 2010 at 12:13:58PM +0200, Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> Acked-by: Koen Kooi <k-kooi@ti.com>
>
> If noone objects, can we get this in ASAP?
Building from scratch armv4t then armv6 was ok, building few more
packages for armv4t again still worked, but now I've upgraded gcc/eglibc
and building eglibc-initial for armv4t first fails:
http://tinderbox.openembedded.org/packages/665289/
http://build.shr-project.org/tests/jama/config.log
see
configure: error: compiler support for __thread is require
and
Fatal error: Invalid -march= option: `armv4t'
shr@opmbuild:~/shr-unstable/tmp/work/armv4t-oe-linux-gnueabi/eglibc-initial-2.12-r11.2+svnr11028/build-arm-oe-linux-gnueabi$ which arm-oe-linux-gnueabi-gcc
/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/bin/arm-oe-linux-gnueabi-gcc
shr@opmbuild:~/shr-unstable/tmp/work/armv4t-oe-linux-gnueabi/eglibc-initial-2.12-r11.2+svnr11028/build-arm-oe-linux-gnueabi$ /home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/bin/arm-oe-linux-gnueabi-gcc -v
Using built-in specs.
COLLECT_GCC=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/bin/arm-oe-linux-gnueabi-gcc
COLLECT_LTO_WRAPPER=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/libexec/gcc/arm-oe-linux-gnueabi/4.5.1/lto-wrapper
Target: arm-oe-linux-gnueabi
Configured with: /home/shr/shr-unstable/tmp/work/armv6-novfp-oe-linux-gnueabi/gcc-cross-4.5-r1+svnr162398/gcc-4.5/configure --build=x86_64-linux --host=x86_64-linux --target=arm-oe-linux-gnueabi --prefix=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp --exec_prefix=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp --bindir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/bin --sbindir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/bin --libexecdir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/libexec --datadir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/share --sysconfdir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/etc --sharedstatedir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/com --localstatedir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/var --libdir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/lib --includedir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/include --oldincludedir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/include --infodir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/share/info --mandir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/share/man --with-gnu-ld --enable-shared --enable-languages=c,c++,objc --enable-threads=posix --disable-multilib --enable-c99 --enable-long-long --enable-symvers=gnu --enable-libstdcxx-pch --program-prefix=arm-oe-linux-gnueabi- --enable-target-optspace --enable-lto --enable-libssp --disable-bootstrap --disable-libgomp --disable-libmudflap --with-float=soft --with-local-prefix=/home/shr/shr-unstable/tmp/sysroots/armv6-novfp-oe-linux-gnueabi/usr --with-gxx-include-dir=/home/shr/shr-unstable/tmp/sysroots/armv6-novfp-oe-linux-gnueabi/usr/include/c++ --with-sysroot=/home/shr/shr-unstable/tmp/sysroots/armv6-novfp-oe-linux-gnueabi --with-build-sysroot=/home/shr/shr-unstable/tmp/sysroots/armv6-novfp-oe-linux-gnueabi --with-build-time-tools=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv6-novfp/bin --disable-libunwind-exceptions --with-mpfr=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr --with-system-zlib --program-prefix=arm-oe-linux-gnueabi- --enable-__cxa_atexit
Thread model: posix
gcc version 4.5.1 20100722 (prerelease) (GCC)
shr@opmbuild:~/shr-unstable/tmp/work/armv4t-oe-linux-gnueabi/eglibc-initial-2.12-r11.2+svnr11028/build-arm-oe-linux-gnueabi$ /home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/bin/arm-oe-linux-gnueabi-gcc -v
Using built-in specs.
COLLECT_GCC=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/bin/arm-oe-linux-gnueabi-gcc
COLLECT_LTO_WRAPPER=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/libexec/gcc/arm-oe-linux-gnueabi/4.5.2/lto-wrapper
Target: arm-oe-linux-gnueabi
Configured with: /home/shr/shr-unstable/tmp/work/armv4t-oe-linux-gnueabi/gcc-cross-initial-4.5-r1+svnr162808/gcc-4.5/configure --build=x86_64-linux --host=x86_64-linux --target=arm-oe-linux-gnueabi --prefix=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t --exec_prefix=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t --bindir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/bin --sbindir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/bin --libexecdir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/libexec --datadir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/share --sysconfdir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/etc --sharedstatedir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/com --localstatedir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/var --libdir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/lib --includedir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/include --oldincludedir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/include --infodir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/share/info --mandir=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/share/man --with-local-prefix=/home/shr/shr-unstable/tmp/sysroots/armv4t-oe-linux-gnueabi/usr --with-newlib --without-headers --disable-shared --disable-threads --disable-multilib --disable-__cxa_atexit --enable-languages=c --program-prefix=arm-oe-linux-gnueabi- --with-local-prefix=/home/shr/shr-unstable/tmp/sysroots/armv4t-oe-linux-gnueabi/usr --with-gxx-include-dir=/home/shr/shr-unstable/tmp/sysroots/armv4t-oe-linux-gnueabi/usr/include/c++ --with-sysroot=/home/shr/shr-unstable/tmp/sysroots/armv4t-oe-linux-gnueabi --with-build-sysroot=/home/shr/shr-unstable/tmp/sysroots/armv4t-oe-linux-gnueabi --with-build-time-tools=/home/shr/shr-unstable/tmp/sysroots/x86_64-linux/usr/armv4t/bin --disable-libmudflap --disable-libgomp --disable-libssp --enable-decimal-float=no --enable-target-optspace --with-float=soft --program-prefix=arm-oe-linux-gnueabi- --enable-__cxa_atexit
Thread model: single
gcc version 4.5.2 20100802 (prerelease) (GCC)
Any hint? I'll check better later.. just wanted to report that maybe not all problems are solved with this serie.
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 13:35 ` Martin Jansa
@ 2010-08-03 15:36 ` Koen Kooi
2010-08-03 17:20 ` Khem Raj
2010-08-03 19:58 ` Khem Raj
2010-08-03 19:56 ` Khem Raj
1 sibling, 2 replies; 22+ messages in thread
From: Koen Kooi @ 2010-08-03 15:36 UTC (permalink / raw)
To: openembedded-devel
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
On 03-08-10 15:35, Martin Jansa wrote:
> On Tue, Aug 03, 2010 at 12:13:58PM +0200, Koen Kooi wrote:
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA1
>>
>> Acked-by: Koen Kooi <k-kooi@ti.com>
>>
>> If noone objects, can we get this in ASAP?
>
> Building from scratch armv4t then armv6 was ok, building few more
> packages for armv4t again still worked, but now I've upgraded gcc/eglibc
> and building eglibc-initial for armv4t first fails:
>
> http://tinderbox.openembedded.org/packages/665289/
> http://build.shr-project.org/tests/jama/config.log
>
> see
> configure: error: compiler support for __thread is require
> and
> Fatal error: Invalid -march= option: `armv4t'
I had that with a previous incarnation of that patchset, but it seems to
have gone away.
Do we want to solve this problem first or apply the patches and solve it
later?
regards,
Koen
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.5 (Darwin)
iD8DBQFMWDdgMkyGM64RGpERArNxAJ9bR5166BqmDfHPUakhlptOhZSfAQCfRZI4
mUb3gJOmb3+3ajmmqC5Ht3w=
=TBbU
-----END PGP SIGNATURE-----
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 15:36 ` Koen Kooi
@ 2010-08-03 17:20 ` Khem Raj
2010-08-04 9:04 ` Martin Jansa
2010-08-03 19:58 ` Khem Raj
1 sibling, 1 reply; 22+ messages in thread
From: Khem Raj @ 2010-08-03 17:20 UTC (permalink / raw)
To: openembedded-devel
On Tue, Aug 3, 2010 at 8:36 AM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 03-08-10 15:35, Martin Jansa wrote:
>> On Tue, Aug 03, 2010 at 12:13:58PM +0200, Koen Kooi wrote:
>>> -----BEGIN PGP SIGNED MESSAGE-----
>>> Hash: SHA1
>>>
>>> Acked-by: Koen Kooi <k-kooi@ti.com>
>>>
>>> If noone objects, can we get this in ASAP?
>>
>> Building from scratch armv4t then armv6 was ok, building few more
>> packages for armv4t again still worked, but now I've upgraded gcc/eglibc
>> and building eglibc-initial for armv4t first fails:
>>
>> http://tinderbox.openembedded.org/packages/665289/
>> http://build.shr-project.org/tests/jama/config.log
>>
>> see
>> configure: error: compiler support for __thread is require
>> and
>> Fatal error: Invalid -march= option: `armv4t'
>
> I had that with a previous incarnation of that patchset, but it seems to
> have gone away.
> Do we want to solve this problem first or apply the patches and solve it
> later?
I would suggest that I push these changes and meanwhile
I will try to reproduce Martin's problem it will take few hours on my
box. It seems that the binutils got wiped out
when Martin cleaned stuff and then building eglibc resorted to
assembler on build machine
and that bombs later.
>
> regards,
>
> Koen
> -----BEGIN PGP SIGNATURE-----
> Version: GnuPG v1.4.5 (Darwin)
>
> iD8DBQFMWDdgMkyGM64RGpERArNxAJ9bR5166BqmDfHPUakhlptOhZSfAQCfRZI4
> mUb3gJOmb3+3ajmmqC5Ht3w=
> =TBbU
> -----END PGP SIGNATURE-----
>
>
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel@lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel
>
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 13:35 ` Martin Jansa
2010-08-03 15:36 ` Koen Kooi
@ 2010-08-03 19:56 ` Khem Raj
1 sibling, 0 replies; 22+ messages in thread
From: Khem Raj @ 2010-08-03 19:56 UTC (permalink / raw)
To: openembedded-devel
On (03/08/10 15:35), Martin Jansa wrote:
> On Tue, Aug 03, 2010 at 12:13:58PM +0200, Koen Kooi wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > Acked-by: Koen Kooi <k-kooi@ti.com>
> >
> > If noone objects, can we get this in ASAP?
>
> Building from scratch armv4t then armv6 was ok, building few more
> packages for armv4t again still worked, but now I've upgraded gcc/eglibc
> and building eglibc-initial for armv4t first fails:
>
> http://tinderbox.openembedded.org/packages/665289/
> http://build.shr-project.org/tests/jama/config.log
I tried this
MACHINE=qemuarm bitbake minimal-image
MACHINE=beagleboard bitbake minimal-image
MACHINE=qemuarm bitbake -c clean gcc-cross gcc-cross-intermediate gcc-cross-initial eglibc eglibc-initial
MACHINE=qemuarm bitbake eglibc
MACHINE=qemuarm bitbake minimal-image
All these steps went without errors.
I would be happy to assist in nailing this issue for you but I need a way
to reproduce it. On other hand I gave a hint what could have gone wrong
Please check that
Thanks
-Khem
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 15:36 ` Koen Kooi
2010-08-03 17:20 ` Khem Raj
@ 2010-08-03 19:58 ` Khem Raj
1 sibling, 0 replies; 22+ messages in thread
From: Khem Raj @ 2010-08-03 19:58 UTC (permalink / raw)
To: openembedded-devel
On (03/08/10 17:36), Koen Kooi wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA1
>
> On 03-08-10 15:35, Martin Jansa wrote:
> > On Tue, Aug 03, 2010 at 12:13:58PM +0200, Koen Kooi wrote:
> >> -----BEGIN PGP SIGNED MESSAGE-----
> >> Hash: SHA1
> >>
> >> Acked-by: Koen Kooi <k-kooi@ti.com>
> >>
> >> If noone objects, can we get this in ASAP?
> >
> > Building from scratch armv4t then armv6 was ok, building few more
> > packages for armv4t again still worked, but now I've upgraded gcc/eglibc
> > and building eglibc-initial for armv4t first fails:
> >
> > http://tinderbox.openembedded.org/packages/665289/
> > http://build.shr-project.org/tests/jama/config.log
> >
> > see
> > configure: error: compiler support for __thread is require
> > and
> > Fatal error: Invalid -march= option: `armv4t'
>
> I had that with a previous incarnation of that patchset, but it seems to
> have gone away.
> Do we want to solve this problem first or apply the patches and solve it
> later?
All right the beast is in. Please rebuild from scratch as the location of
toolchain has once again changed.
Thanks a bunch to everyone who helped in testing these patches and thereby
making them worthy
Thanks
-Khem
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach)
2010-08-03 17:20 ` Khem Raj
@ 2010-08-04 9:04 ` Martin Jansa
0 siblings, 0 replies; 22+ messages in thread
From: Martin Jansa @ 2010-08-04 9:04 UTC (permalink / raw)
To: openembedded-devel
On Tue, Aug 03, 2010 at 10:20:42AM -0700, Khem Raj wrote:
> On Tue, Aug 3, 2010 at 8:36 AM, Koen Kooi <k.kooi@student.utwente.nl> wrote:
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA1
> >
> > On 03-08-10 15:35, Martin Jansa wrote:
> >> On Tue, Aug 03, 2010 at 12:13:58PM +0200, Koen Kooi wrote:
> >>> -----BEGIN PGP SIGNED MESSAGE-----
> >>> Hash: SHA1
> >>>
> >>> Acked-by: Koen Kooi <k-kooi@ti.com>
> >>>
> >>> If noone objects, can we get this in ASAP?
> >>
> >> Building from scratch armv4t then armv6 was ok, building few more
> >> packages for armv4t again still worked, but now I've upgraded gcc/eglibc
> >> and building eglibc-initial for armv4t first fails:
> >>
> >> http://tinderbox.openembedded.org/packages/665289/
> >> http://build.shr-project.org/tests/jama/config.log
> >>
> >> see
> >> configure: error: compiler support for __thread is require
> >> and
> >> Fatal error: Invalid -march= option: `armv4t'
> >
> > I had that with a previous incarnation of that patchset, but it seems to
> > have gone away.
> > Do we want to solve this problem first or apply the patches and solve it
> > later?
> I would suggest that I push these changes and meanwhile
> I will try to reproduce Martin's problem it will take few hours on my
> box. It seems that the binutils got wiped out
> when Martin cleaned stuff and then building eglibc resorted to
> assembler on build machine
> and that bombs later.
I think I had last incarnation (at last latest on patchwork - pw-am.sh
2521 2524 2525 2523 2522).
Khem was right about binutils issue.
I did something like this:
MACHINE=om-gta02 bitbake shr-image
MACHINE=htcdream bitbake shr-image
git pull (for newer gcc+eglibc)
MACHINE=om-gta02 bitbake shr-image - and now it failed to build eglibc-initial
MACHINE=htcdream bitbake shr-image - this upgraded gcc/eglibc fine
export MACHINE=om-gta02
for i in openembedded/recipes/gcc/gcc*4.5*bb \
openembedded/recipes/eglibc/eglibc*2.12*.bb; do
bitbake -c clean -b $i;
done
MACHINE=om-gta02 bitbake shr-image - still failing in eglibc-initial
export MACHINE=htcdream
for i in openembedded/recipes/gcc/gcc*4.5*bb \
openembedded/recipes/eglibc/eglibc*2.12*.bb; do
bitbake -c clean -b $i;
done
MACHINE=om-gta02 bitbake shr-image - still failing in eglibc-initial
export MACHINE=om-gta02
for i in openembedded/recipes/gcc/gcc*4.5*bb
openembedded/recipes/eglibc/eglibc*2.12*.bb
openembedded/recipes/binutils/binutils*2.20.1*.bb ; do
bitbake -c clean -b $i;
done
MACHINE=om-gta02 bitbake shr-image - seems to pass now
Regards,
--
Martin 'JaMa' Jansa jabber: Martin.Jansa@gmail.com
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2010-08-04 9:04 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-07-31 5:34 [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Khem Raj
2010-07-31 5:34 ` [PATCH 1/5] bitbake.conf, cmake.bbclass, cross.bbclass, icecc.bbclass: Point the toolchain paths to new multi-machine friendly toolchain install location Khem Raj
2010-07-31 5:34 ` [PATCH 2/5] binutils-cross.inc: Dont install duplicate copies of tools create relative symlinks instead Khem Raj
2010-07-31 5:34 ` [PATCH 3/5] gcc, eglibc: Use the paths for mutli-machine safe toolchain install Khem Raj
2010-07-31 5:34 ` [PATCH 4/5] recipes: Fix the PATHs for toolchains Khem Raj
2010-07-31 5:34 ` [PATCH 5/5] mpfr_3.0.0.bb: Override needs to be thumb instead of armv4t Khem Raj
2010-07-31 9:48 ` [PATCH 0/5][v4] Make multi-machine toolchains to co-exist (Alternate approach) Koen Kooi
2010-07-31 13:34 ` Koen Kooi
2010-07-31 18:54 ` Koen Kooi
2010-08-02 9:33 ` Koen Kooi
2010-08-02 16:27 ` Khem Raj
2010-08-03 10:13 ` Koen Kooi
2010-08-03 10:21 ` Martin Jansa
2010-08-03 10:29 ` Andrea Adami
2010-08-03 10:31 ` Frans Meulenbroeks
2010-08-03 13:35 ` Martin Jansa
2010-08-03 15:36 ` Koen Kooi
2010-08-03 17:20 ` Khem Raj
2010-08-04 9:04 ` Martin Jansa
2010-08-03 19:58 ` Khem Raj
2010-08-03 19:56 ` Khem Raj
2010-08-01 15:48 ` Eric Bénard
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.