Patchwork [4/4] tclibc-glibc: add weak assigment to TARGET_OS

login
register
mail settings
Submitter Adrian Alonso
Date July 5, 2011, 7:38 p.m.
Message ID <1309894692-15230-4-git-send-email-aalonso@secretlab.ca>
Download mbox | patch
Permalink /patch/7015/
State New, archived
Headers show

Comments

Adrian Alonso - July 5, 2011, 7:38 p.m.
* Add weak assigment to TARGET_OS variable so it can be
  overrided to match external toolchain tripplets.
* Toolchain prefix is expanded from
  TARGET_SYS = TARGET_ARCH + TARGET_VENDOR + TARGET_OS

Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
---
 meta/conf/distro/include/tclibc-glibc.inc |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
Richard Purdie - July 7, 2011, 12:42 p.m.
On Tue, 2011-07-05 at 14:38 -0500, Adrian Alonso wrote:
> * Add weak assigment to TARGET_OS variable so it can be
>   overrided to match external toolchain tripplets.
> * Toolchain prefix is expanded from
>   TARGET_SYS = TARGET_ARCH + TARGET_VENDOR + TARGET_OS
> 
> Signed-off-by: Adrian Alonso <aalonso@secretlab.ca>
> ---
>  meta/conf/distro/include/tclibc-glibc.inc |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
> index 5e7afc1..997fc11 100644
> --- a/meta/conf/distro/include/tclibc-glibc.inc
> +++ b/meta/conf/distro/include/tclibc-glibc.inc
> @@ -2,7 +2,7 @@
>  # glibc specific configuration
>  #
>  
> -TARGET_OS = "linux"
> +TARGET_OS ?= "linux"
>  TARGET_OS_arm = "linux-gnueabi"
>  TARGET_OS_armeb = "linux-gnueabi"
>  TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce500', 'ppce500v2']]}"

I've merged the first three patches, thanks. This one makes me nervous
as TARGET_OS has traditionally been a problematic variable and ?= hasn't
always done what you'd expect. This therefore needs a bit more testing
and investigation before we can merge it as I think there could be
problems exposed...

Cheers,

Richard

Patch

diff --git a/meta/conf/distro/include/tclibc-glibc.inc b/meta/conf/distro/include/tclibc-glibc.inc
index 5e7afc1..997fc11 100644
--- a/meta/conf/distro/include/tclibc-glibc.inc
+++ b/meta/conf/distro/include/tclibc-glibc.inc
@@ -2,7 +2,7 @@ 
 # glibc specific configuration
 #
 
-TARGET_OS = "linux"
+TARGET_OS ?= "linux"
 TARGET_OS_arm = "linux-gnueabi"
 TARGET_OS_armeb = "linux-gnueabi"
 TARGET_OS_powerpc = "linux${@['','-gnuspe'][bb.data.getVar('BASE_PACKAGE_ARCH',d,1) in ['ppce500', 'ppce500v2']]}"