summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-07-15 10:16:57 +0100
committerRichard Purdie <rpurdie@linux.intel.com>2010-07-15 10:16:57 +0100
commitab4ee45ba47f0e34048aa4df7b54695597239ce0 (patch)
tree9f7f3360f24c53ef1c7f60f8ef8bd5eb1a7d41ed
parentcc86905780572b84afa593a15756436a639de9b5 (diff)
downloadopenembedded-core-ab4ee45ba47f0e34048aa4df7b54695597239ce0.tar.gz
openembedded-core-ab4ee45ba47f0e34048aa4df7b54695597239ce0.tar.bz2
openembedded-core-ab4ee45ba47f0e34048aa4df7b54695597239ce0.tar.xz
openembedded-core-ab4ee45ba47f0e34048aa4df7b54695597239ce0.zip
cross-canadian: Fix sysroot path
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/packages/binutils/binutils-cross-canadian.inc2
-rw-r--r--meta/packages/binutils/binutils-cross-canadian_2.20.1.bb2
-rw-r--r--meta/packages/gcc/gcc-configure-sdk.inc2
-rw-r--r--meta/packages/gcc/gcc-cross-canadian_4.3.3.bb2
4 files changed, 4 insertions, 4 deletions
diff --git a/meta/packages/binutils/binutils-cross-canadian.inc b/meta/packages/binutils/binutils-cross-canadian.inc
index a1fdda0f8..9fe3ed545 100644
--- a/meta/packages/binutils/binutils-cross-canadian.inc
+++ b/meta/packages/binutils/binutils-cross-canadian.inc
@@ -1,6 +1,6 @@
inherit cross-canadian
DEPENDS = "flex-native bison-native virtual/${HOST_PREFIX}gcc-crosssdk virtual/libc-nativesdk zlib-nativesdk gettext-nativesdk"
-EXTRA_OECONF = "--with-sysroot=${prefix}/${TARGET_SYS} \
+EXTRA_OECONF = "--with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \
--program-prefix=${TARGET_PREFIX}"
do_install () {
diff --git a/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb b/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb
index e91e7dca3..13fc22aa6 100644
--- a/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb
+++ b/meta/packages/binutils/binutils-cross-canadian_2.20.1.bb
@@ -1,3 +1,3 @@
require binutils_${PV}.bb
require binutils-cross-canadian.inc
-PR = "r1"
+PR = "r3"
diff --git a/meta/packages/gcc/gcc-configure-sdk.inc b/meta/packages/gcc/gcc-configure-sdk.inc
index acf8a3cde..a983c43cf 100644
--- a/meta/packages/gcc/gcc-configure-sdk.inc
+++ b/meta/packages/gcc/gcc-configure-sdk.inc
@@ -7,7 +7,7 @@ USE_NLS = '${@base_conditional( "TARGET_OS", "linux-uclibcgnueabi", "no", "", d
EXTRA_OECONF_PATHS = "--with-local-prefix=${SDKPATH}/${TARGET_SYS}${target_exec_prefix} \
--with-gxx-include-dir=${prefix}/${TARGET_SYS}${target_includedir}/c++/${BINV}/ \
--with-build-time-tools=${STAGING_DIR_NATIVE}${prefix_native}/${TARGET_SYS}/bin \
- --with-sysroot=${prefix}/${TARGET_SYS} \
+ --with-sysroot=${SDKPATH}/sysroots/${TARGET_SYS} \
--with-build-sysroot=${STAGING_DIR_TARGET}"
#
diff --git a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
index 8e9e4ce38..02a78aa41 100644
--- a/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
+++ b/meta/packages/gcc/gcc-cross-canadian_4.3.3.bb
@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
require gcc-configure-sdk.inc
require gcc-package-sdk.inc
-PR = "r13"
+PR = "r15"
DEPENDS += "gmp-nativesdk mpfr-nativesdk"
RDEPENDS_${PN} += "mpfr-nativesdk"