Patchwork cross-canadian: Copy target_ definitions from cross.bbclass

login
register
mail settings
Submitter Richard Purdie
Date July 24, 2014, 9:09 p.m.
Message ID <1406236178.27697.17.camel@ted>
Download mbox | patch
Permalink /patch/76637/
State Accepted
Commit aee3b5330d263e224851ed1c5c3562ec04e0a2f7
Headers show

Comments

Richard Purdie - July 24, 2014, 9:09 p.m.
A while back we fixed the cross definitions to work better in multilib
configurations, apply the same fixes to cross-candian.bbclass

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Mark Hatle - July 24, 2014, 9:22 p.m.
On 7/24/14, 4:09 PM, Richard Purdie wrote:
> A while back we fixed the cross definitions to work better in multilib
> configurations, apply the same fixes to cross-candian.bbclass
>
> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

Tested this

Acked-by: Mark Hatle <mark.hatle@windriver.com>

> diff --git a/meta/classes/cross-canadian.bbclass
> b/meta/classes/cross-canadian.bbclass
> index e536118..6da43fe 100644
> --- a/meta/classes/cross-canadian.bbclass
> +++ b/meta/classes/cross-canadian.bbclass
> @@ -84,11 +84,12 @@ EXTRANATIVEPATH += "chrpath-native"
>   # Path mangling needed by the cross packaging
>   # Note that we use := here to ensure that libdir and includedir are
>   # target paths.
> -target_libdir := "${libdir}"
> -target_includedir := "${includedir}"
> -target_base_libdir := "${base_libdir}"
> +target_base_prefix := "${base_prefix}"
>   target_prefix := "${prefix}"
>   target_exec_prefix := "${exec_prefix}"
> +target_base_libdir = "${target_base_prefix}/${baselib}"
> +target_libdir = "${target_exec_prefix}/${baselib}"
> +target_includedir := "${includedir}"
>
>   # Change to place files in SDKPATH
>   base_prefix = "${SDKPATHNATIVE}"
>
>

Patch

diff --git a/meta/classes/cross-canadian.bbclass
b/meta/classes/cross-canadian.bbclass
index e536118..6da43fe 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -84,11 +84,12 @@  EXTRANATIVEPATH += "chrpath-native"
 # Path mangling needed by the cross packaging
 # Note that we use := here to ensure that libdir and includedir are
 # target paths.
-target_libdir := "${libdir}"
-target_includedir := "${includedir}"
-target_base_libdir := "${base_libdir}"
+target_base_prefix := "${base_prefix}"
 target_prefix := "${prefix}"
 target_exec_prefix := "${exec_prefix}"
+target_base_libdir = "${target_base_prefix}/${baselib}"
+target_libdir = "${target_exec_prefix}/${baselib}"
+target_includedir := "${includedir}"
 
 # Change to place files in SDKPATH
 base_prefix = "${SDKPATHNATIVE}"