summaryrefslogtreecommitdiffstats
path: root/meta/classes/cross-canadian.bbclass
diff options
context:
space:
mode:
Diffstat (limited to 'meta/classes/cross-canadian.bbclass')
-rw-r--r--meta/classes/cross-canadian.bbclass14
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass
index 1a045ba16d..edd51da87b 100644
--- a/meta/classes/cross-canadian.bbclass
+++ b/meta/classes/cross-canadian.bbclass
@@ -9,14 +9,14 @@
9# or indirectly via dependency. No need to be in 'world'. 9# or indirectly via dependency. No need to be in 'world'.
10EXCLUDE_FROM_WORLD = "1" 10EXCLUDE_FROM_WORLD = "1"
11 11
12STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 12STAGING_BINDIR_TOOLCHAIN = "${STAGING_DIR_NATIVE}${bindir_native}/${SDK_ARCH}${SDK_VENDOR}-${SDK_OS}:${STAGING_DIR_NATIVE}${bindir_native}/${OLD_BASE_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
13 13
14# 14#
15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS 15# Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS
16# 16#
17OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" 17OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}"
18OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}" 18OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}"
19OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} 19OLD_BASE_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH}
20BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" 20BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk"
21python () { 21python () {
22 archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split() 22 archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split()
@@ -25,7 +25,7 @@ python () {
25 sdkarchs.append(arch + '-nativesdk') 25 sdkarchs.append(arch + '-nativesdk')
26 bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d) 26 bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d)
27} 27}
28MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" 28MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}"
29 29
30INHIBIT_DEFAULT_DEPS = "1" 30INHIBIT_DEFAULT_DEPS = "1"
31 31
@@ -66,12 +66,12 @@ target_exec_prefix := "${exec_prefix}"
66base_prefix = "${SDKPATHNATIVE}" 66base_prefix = "${SDKPATHNATIVE}"
67prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" 67prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
68exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" 68exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}"
69bindir = "${exec_prefix}/bin/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 69bindir = "${exec_prefix}/bin/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
70sbindir = "${bindir}" 70sbindir = "${bindir}"
71base_bindir = "${bindir}" 71base_bindir = "${bindir}"
72base_sbindir = "${bindir}" 72base_sbindir = "${bindir}"
73libdir = "${exec_prefix}/lib/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 73libdir = "${exec_prefix}/lib/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
74libexecdir = "${exec_prefix}/libexec/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" 74libexecdir = "${exec_prefix}/libexec/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}"
75 75
76FILES_${PN} = "${prefix}" 76FILES_${PN} = "${prefix}"
77FILES_${PN}-dbg += "${prefix}/.debug \ 77FILES_${PN}-dbg += "${prefix}/.debug \