From d6c7a44b94aa0f871d3ad1a2097a4a8d773eabf5 Mon Sep 17 00:00:00 2001 From: Richard Purdie Date: Wed, 20 Jan 2010 15:56:35 +0000 Subject: [PATCH] gcc-cross-canadian: Fix include paths and hence c++ compiler issues Signed-off-by: Richard Purdie --- meta/classes/cross-canadian.bbclass | 8 ++++++++ meta/packages/gcc/gcc-cross-canadian_4.2.3.bb | 2 +- meta/packages/gcc/gcc-cross-canadian_4.3.3.bb | 2 +- 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}" DEPENDS_GETTEXT = "gettext-native gettext-nativesdk" +# Path mangling needed by the cross packaging +# Note that we use := here to ensure that libdir and includedir are +# target paths, not CROSS_DIR paths. +target_libdir := "${libdir}" +target_includedir := "${includedir}" +target_base_libdir := "${base_libdir}" +target_prefix := "${prefix}" + # Change to place files in SDKPATH prefix = "${SDKPATH}" exec_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 require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "r7" +PR = "r8" DEPENDS += "gmp-nativesdk mpfr-nativesdk" RDEPENDS_${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 require gcc-configure-sdk.inc require gcc-package-sdk.inc -PR = "r8" +PR = "r9" DEPENDS += "gmp-nativesdk mpfr-nativesdk" RDEPENDS_${PN} += "mpfr-nativesdk"