Skip to contentSkip to conversation

cross-canadian: Copy target_ definitions from cross.bbclass

PATCH In review Richard Purdie 2 participants 2 messages Jul 24, 2014

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 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

(quoted diff) +0 -0

b/meta/classes/cross-canadian.bbclass
index e536118..6da43fe 100644

meta/classes/cross-canadian.bbclass +4 -3
@@ -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}"
Acked-by on v1 1/1
#1 lore raw
Quoted 4 lines · Richard Purdie

A while back we fixed the cross definitions to work better in multilib configurations, apply the same fixes to cross-candian.bbclass

Tested this

Quoted 23 lines
meta/classes/cross-canadian.bbclass +4 -3
index e536118..6da43fe 100644
@@ -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}"