diff options
| author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-22 16:10:16 +0100 |
|---|---|---|
| committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-06-28 13:45:55 +0100 |
| commit | e623d3015bbdeb2b42b9763937be899a1fa9c0ca (patch) | |
| tree | daad2115efe99a2b20caa97961bd4df11db34e1a /meta/classes/cross-canadian.bbclass | |
| parent | 4ac0b49b65106c2214ae80517fe9f66630d4540c (diff) | |
| download | openembedded-core-e623d3015bbdeb2b42b9763937be899a1fa9c0ca.tar.gz openembedded-core-e623d3015bbdeb2b42b9763937be899a1fa9c0ca.tar.bz2 openembedded-core-e623d3015bbdeb2b42b9763937be899a1fa9c0ca.tar.xz openembedded-core-e623d3015bbdeb2b42b9763937be899a1fa9c0ca.zip | |
classes/conf: Drop MULTIMACH_ARCH variable, it adds unused complexity and serves no useful purpose
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/cross-canadian.bbclass')
| -rw-r--r-- | meta/classes/cross-canadian.bbclass | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/meta/classes/cross-canadian.bbclass b/meta/classes/cross-canadian.bbclass index 1a045ba16..edd51da87 100644 --- a/meta/classes/cross-canadian.bbclass +++ b/meta/classes/cross-canadian.bbclass @@ -9,14 +9,14 @@ # or indirectly via dependency. No need to be in 'world'. EXCLUDE_FROM_WORLD = "1" -STAGING_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}" +STAGING_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}" # # Update BASE_PACKAGE_ARCH and PACKAGE_ARCHS # -OLD_MULTIMACH_ARCH := "${MULTIMACH_ARCH}" +OLD_PACKAGE_ARCH := "${PACKAGE_ARCH}" OLD_MULTIMACH_TARGET_SYS := "${MULTIMACH_TARGET_SYS}" -OLD_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} +OLD_BASE_PACKAGE_ARCH := ${BASE_PACKAGE_ARCH} BASE_PACKAGE_ARCH = "${SDK_ARCH}-nativesdk" python () { archs = bb.data.getVar('PACKAGE_ARCHS', d, True).split() @@ -25,7 +25,7 @@ python () { sdkarchs.append(arch + '-nativesdk') bb.data.setVar('PACKAGE_ARCHS', " ".join(sdkarchs), d) } -MULTIMACH_TARGET_SYS = "${MULTIMACH_ARCH}${HOST_VENDOR}-${HOST_OS}" +MULTIMACH_TARGET_SYS = "${PACKAGE_ARCH}${HOST_VENDOR}-${HOST_OS}" INHIBIT_DEFAULT_DEPS = "1" @@ -66,12 +66,12 @@ target_exec_prefix := "${exec_prefix}" base_prefix = "${SDKPATHNATIVE}" prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" exec_prefix = "${SDKPATHNATIVE}${prefix_nativesdk}" -bindir = "${exec_prefix}/bin/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +bindir = "${exec_prefix}/bin/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" sbindir = "${bindir}" base_bindir = "${bindir}" base_sbindir = "${bindir}" -libdir = "${exec_prefix}/lib/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" -libexecdir = "${exec_prefix}/libexec/${OLD_MULTIMACH_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +libdir = "${exec_prefix}/lib/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" +libexecdir = "${exec_prefix}/libexec/${OLD_PACKAGE_ARCH}${TARGET_VENDOR}-${TARGET_OS}" FILES_${PN} = "${prefix}" FILES_${PN}-dbg += "${prefix}/.debug \ |