cross-canadian: Fix sysroot path

Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>

diff --git a/meta/packages/binutils/binutils-cross-canadian.inc b/meta/packages/binutils/binutils-cross-canadian.inc
index a1fdda0f822868083a48a87287b0dade4d16d2ec..9fe3ed54512b417bebe87d9a72dd1806b8327b24 100644 (file)
--- 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 e91e7dca3ffecbe553d47b2f046262af8022b9c3..13fc22aa647c3d107a5b26e3fbff440be6ab86c0 100644 (file)
--- 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 acf8a3cde4633ebd803bb48c76d58bfaafe29ba7..a983c43cff512ea0467f3781ac50478bb55cad5b 100644 (file)
--- 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 8e9e4ce38913163d78402d36344b5866bc23b229..02a78aa4118f610f8b45867afc7cef37cd02fc6f 100644 (file)
--- 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"