Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] gcc-cross-canadian: Use ${target_includedir} for compatibility with meta-micro
@ 2017-05-16 12:40 Mike Crowe
  2017-06-13  9:09 ` Mike Crowe
  0 siblings, 1 reply; 3+ messages in thread
From: Mike Crowe @ 2017-05-16 12:40 UTC (permalink / raw)
  To: openembedded-core; +Cc: Mike Crowe

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@mcrowe.com>
Acked-by: Phil Blundell <pb@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



^ permalink raw reply related	[flat|nested] 3+ messages in thread

* Re: [PATCH] gcc-cross-canadian: Use ${target_includedir} for compatibility with meta-micro
  2017-05-16 12:40 [PATCH] gcc-cross-canadian: Use ${target_includedir} for compatibility with meta-micro Mike Crowe
@ 2017-06-13  9:09 ` Mike Crowe
  2017-06-13 18:33   ` Khem Raj
  0 siblings, 1 reply; 3+ messages in thread
From: Mike Crowe @ 2017-06-13  9:09 UTC (permalink / raw)
  To: openembedded-core

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@mcrowe.com>
> Acked-by: Phil Blundell <pb@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.


^ permalink raw reply	[flat|nested] 3+ messages in thread

* Re: [PATCH] gcc-cross-canadian: Use ${target_includedir} for compatibility with meta-micro
  2017-06-13  9:09 ` Mike Crowe
@ 2017-06-13 18:33   ` Khem Raj
  0 siblings, 0 replies; 3+ messages in thread
From: Khem Raj @ 2017-06-13 18:33 UTC (permalink / raw)
  To: Mike Crowe; +Cc: Patches and discussions about the oe-core layer

On Tue, Jun 13, 2017 at 2:09 AM, Mike Crowe <mac@mcrowe.com> wrote:
> 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.
>>

patch looks ok to me

>> Signed-off-by: Mike Crowe <mac@mcrowe.com>
>> Acked-by: Phil Blundell <pb@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.
> --
> _______________________________________________
> Openembedded-core mailing list
> Openembedded-core@lists.openembedded.org
> http://lists.openembedded.org/mailman/listinfo/openembedded-core


^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2017-06-13 18:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-16 12:40 [PATCH] gcc-cross-canadian: Use ${target_includedir} for compatibility with meta-micro Mike Crowe
2017-06-13  9:09 ` Mike Crowe
2017-06-13 18:33   ` Khem Raj

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox