summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2010-01-20 15:56:35 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2010-01-20 15:56:35 +0000
commitd6c7a44b94aa0f871d3ad1a2097a4a8d773eabf5 (patch)
tree18a5c5b7968ca5dd02a87b606be4b21c2048b7fd
parent3139368254ca8060d1b42d8405f9554c8d87fd5d (diff)
downloadpoky-d6c7a44b94aa0f871d3ad1a2097a4a8d773eabf5.tar.gz
gcc-cross-canadian: Fix include paths and hence c++ compiler issues
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
-rw-r--r--meta/classes/cross-canadian.bbclass8
-rw-r--r--meta/packages/gcc/gcc-cross-canadian_4.2.3.bb2
-rw-r--r--meta/packages/gcc/gcc-cross-canadian_4.3.3.bb2
3 files changed, 10 insertions, 2 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 1cbc1fb9b6..b7b449f478 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -34,6 +34,14 @@ LDFLAGS = "${BUILDSDK_LDFLAGS}"
34 34
35DEPENDS_GETTEXT = "gettext-native gettext-nativesdk" 35DEPENDS_GETTEXT = "gettext-native gettext-nativesdk"
36 36
37# Path mangling needed by the cross packaging
38# Note that we use := here to ensure that libdir and includedir are
39# target paths, not CROSS_DIR paths.
40target_libdir := "${libdir}"
41target_includedir := "${includedir}"
42target_base_libdir := "${base_libdir}"
43target_prefix := "${prefix}"
44
37# Change to place files in SDKPATH 45# Change to place files in SDKPATH
38prefix = "${SDKPATH}" 46prefix = "${SDKPATH}"
39exec_prefix = "${SDKPATH}" 47exec_prefix = "${SDKPATH}"
diff --git a/meta/packages/gcc/gcc-cross-canadian_4.2.3.bb b/meta/packages/gcc/gcc-cross-canadian_4.2.3.bb
index f6e60ebf2d..f68edbeb12 100644
--- a/meta/packages/gcc/gcc-cross-canadian_4.2.3.bb
+++ b/meta/packages/gcc/gcc-cross-canadian_4.2.3.bb
@@ -5,7 +5,7 @@ require gcc-cross-canadian.inc
5require gcc-configure-sdk.inc 5require gcc-configure-sdk.inc
6require gcc-package-sdk.inc 6require gcc-package-sdk.inc
7 7
8PR = "r7" 8PR = "r8"
9 9
10DEPENDS += "gmp-nativesdk mpfr-nativesdk" 10DEPENDS += "gmp-nativesdk mpfr-nativesdk"
11RDEPENDS_${PN} += "mpfr-nativesdk" 11RDEPENDS_${PN} += "mpfr-nativesdk"
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 f68edbeb12..64030ad32a 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
5require gcc-configure-sdk.inc 5require gcc-configure-sdk.inc
6require gcc-package-sdk.inc 6require gcc-package-sdk.inc
7 7
8PR = "r8" 8PR = "r9"
9 9
10DEPENDS += "gmp-nativesdk mpfr-nativesdk" 10DEPENDS += "gmp-nativesdk mpfr-nativesdk"
11RDEPENDS_${PN} += "mpfr-nativesdk" 11RDEPENDS_${PN} += "mpfr-nativesdk"