summaryrefslogtreecommitdiffstats
path: root/meta/conf
diff options
context:
space:
mode:
authorNitin A Kamble <nitin.a.kamble@intel.com>2011-10-12 11:30:03 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-10-20 17:13:37 +0100
commitacf71bb712406ca711bfe8874b10f86d8d860068 (patch)
tree1a73777ccb4f6824fc986583a2a4bf772d60ef72 /meta/conf
parentc37b2094cb36f60fe47145940c469db0faa2c6d4 (diff)
downloadpoky-acf71bb712406ca711bfe8874b10f86d8d860068.tar.gz
x86 tune files: set baselib for x32 tune as libx32
This ensures that on a multilib system the two executable formats don't conflict. (From OE-Core rev: 7b3cf9556085429faf8155a6eea412a0b8cc2c52) Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/conf')
-rw-r--r--meta/conf/machine/include/ia32/arch-ia32.inc2
-rw-r--r--meta/conf/machine/include/tune-core2.inc2
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/conf/machine/include/ia32/arch-ia32.inc b/meta/conf/machine/include/ia32/arch-ia32.inc
index a52e33a619..ee919830c0 100644
--- a/meta/conf/machine/include/ia32/arch-ia32.inc
+++ b/meta/conf/machine/include/ia32/arch-ia32.inc
@@ -44,6 +44,6 @@ PACKAGE_EXTRA_ARCHS_tune-x86-64 = "x86_64"
44 44
45AVAILTUNES += "x86-64-x32" 45AVAILTUNES += "x86-64-x32"
46TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" 46TUNE_FEATURES_tune-x86-64-x32 ?= "mx32"
47BASE_LIB_tune-x86-64-x32 ?= "lib" 47BASE_LIB_tune-x86-64-x32 ?= "libx32"
48PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32" 48PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32"
49TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}" 49TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}"
diff --git a/meta/conf/machine/include/tune-core2.inc b/meta/conf/machine/include/tune-core2.inc
index 78f8f4d430..565a39c273 100644
--- a/meta/conf/machine/include/tune-core2.inc
+++ b/meta/conf/machine/include/tune-core2.inc
@@ -20,5 +20,5 @@ PACKAGE_EXTRA_ARCHS_tune-core2-64 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64} core2-64
20 20
21AVAILTUNES += "core2-64-x32" 21AVAILTUNES += "core2-64-x32"
22TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2" 22TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2"
23BASE_LIB_tune-core2-64-x32 ?= "lib" 23BASE_LIB_tune-core2-64-x32 ?= "libx32"
24PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32" 24PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32"