[OE-core] [PATCH] gcc-cross-canadian: Use ${target_includedir} for compatibility with meta-micro

Mike Crowe mac at mcrowe.com
Tue Jun 13 09:09:26 UTC 2017


On Tuesday 16 May 2017 at 13:40:00 +0100, Mike Crowe wrote:
> meta-micro puts headers in /include rather than /usr/include in the
> sysroot. ${target_includedir} means that the correct path will be used
> automatically.
> 
> Signed-off-by: Mike Crowe <mac at mcrowe.com>
> Acked-by: Phil Blundell <pb at pbcl.net>
> ---
>  meta/recipes-devtools/gcc/gcc-cross-canadian.inc | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> index ec1d281800..91a6fa6994 100644
> --- a/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> +++ b/meta/recipes-devtools/gcc/gcc-cross-canadian.inc
> @@ -80,7 +80,7 @@ FILES_${PN} = "\
>      ${includedir}/c++/${BINV} \
>      ${prefix}/${TARGET_SYS}/bin/* \
>      ${prefix}/${TARGET_SYS}/lib/* \
> -    ${prefix}/${TARGET_SYS}/usr/include/* \
> +    ${prefix}/${TARGET_SYS}${target_includedir}/* \
>  "
>  INSANE_SKIP_${PN} += "dev-so"
>  
> @@ -153,7 +153,7 @@ ELFUTILS = "nativesdk-elfutils"
>  DEPENDS += "nativesdk-gmp nativesdk-mpfr nativesdk-libmpc ${ELFUTILS} nativesdk-zlib"
>  RDEPENDS_${PN} += "nativesdk-mpfr nativesdk-libmpc ${ELFUTILS}"
>  
> -SYSTEMHEADERS = "/usr/include"
> +SYSTEMHEADERS = "${target_includedir}/"
>  SYSTEMLIBS = "${target_base_libdir}/"
>  SYSTEMLIBS1 = "${target_libdir}/"
>  
> -- 
> 2.11.0

This patch ended up in https://patchwork.openembedded.org/patch/139908/ .
There don't appear to have been any objections. Is there any chance it
could go in?

Thanks.

Mike.



More information about the Openembedded-core mailing list