[oe] [PATCH][STABLE] gcc-canadian-sdk: Fix C++ relocation, add SYSROOT, use SDK_REALPATH_MINGW, bump PR.

[Khem Raj]

On (24/04/09 09:11), Tom Rini wrote:
> From: Tom Rini <trini at embeddedalley.com>
> 
> 
> Signed-off-by: Tom Rini <trini at embeddedalley.com>

Acked-by: Khem Raj <raj.khem at gmail.com>

> ---
>  recipes/gcc/gcc-canadian-sdk_4.2.4.bb      |    2 +-
>  recipes/gcc/gcc-configure-canadian-sdk.inc |    7 ++++---
>  2 files changed, 5 insertions(+), 4 deletions(-)
> 
> diff --git a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
> index ae3245b..d78ab75 100644
> --- a/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
> +++ b/recipes/gcc/gcc-canadian-sdk_4.2.4.bb
> @@ -1,6 +1,6 @@
>  inherit canadian-sdk
>  
> -PR = "r1"
> +PR = "r2"
>  
>  FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/gcc-${PV}"
>  
> diff --git a/recipes/gcc/gcc-configure-canadian-sdk.inc b/recipes/gcc/gcc-configure-canadian-sdk.inc
> index c95a6c4..738b120 100644
> --- a/recipes/gcc/gcc-configure-canadian-sdk.inc
> +++ b/recipes/gcc/gcc-configure-canadian-sdk.inc
> @@ -61,11 +61,12 @@ export WINDRES_FOR_TARGET="${TARGET_PREFIX}windres"
>  EXTRA_OECONF_DEP ?= ""
>  
>  EXTRA_OECONF += ""
> +# On MinGW hosts we want to prepend a drive letter, in ${SDK_REALPATH_MINGW}
> +# to the sysroot path.
> +SYSROOT = "${@['${SDK_REALPATH}/${TARGET_SYS}', '${SDK_REALPATH_MINGW}${SDK_REALPATH}/${TARGET_SYS}'][bb.data.getVar('SDK_OS', d, 1) in ['mingw32', 'mingw64']]}"
>  EXTRA_OECONF_PATHS = " \
> -	--with-local-prefix=$dollar{prefix}/local \
> -	--with-gxx-include-dir=$dollar{prefix}/${TARGET_SYS}/usr/include/c++/${BINV} \
>  	--with-build-sysroot=${STAGING_DIR_TARGET} \
> -	--with-sysroot=${SDK_REALPATH}/${TARGET_SYS} \
> +	--with-sysroot=${SYSROOT} \
>  "
>  
>  do_configure () {
> -- 
> 1.5.6.3
> 
> 
> _______________________________________________
> Openembedded-devel mailing list
> Openembedded-devel at lists.openembedded.org
> http://lists.linuxtogo.org/cgi-bin/mailman/listinfo/openembedded-devel