[oe-commits] Richard Purdie : cross-canadian: Copy target_ definitions from cross.bbclass

[git at git.openembedded.org]

Module: openembedded-core.git
Branch: master-next
Commit: 071ba6181002896f0342afbadab994b0f36fda6e
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=071ba6181002896f0342afbadab994b0f36fda6e

Author: Richard Purdie <richard.purdie at linuxfoundation.org>
Date:   Thu Jul 24 22:09:38 2014 +0100

cross-canadian: Copy target_ definitions from cross.bbclass

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 at linuxfoundation.org>

---

 meta/classes/cross-canadian.bbclass | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

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}"