diff options
author | Nitin A Kamble <nitin.a.kamble@intel.com> | 2011-10-12 11:30:03 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-10-20 17:13:37 +0100 |
commit | acf71bb712406ca711bfe8874b10f86d8d860068 (patch) | |
tree | 1a73777ccb4f6824fc986583a2a4bf772d60ef72 /meta/conf/machine | |
parent | c37b2094cb36f60fe47145940c469db0faa2c6d4 (diff) | |
download | poky-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/machine')
-rw-r--r-- | meta/conf/machine/include/ia32/arch-ia32.inc | 2 | ||||
-rw-r--r-- | meta/conf/machine/include/tune-core2.inc | 2 |
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 | ||
45 | AVAILTUNES += "x86-64-x32" | 45 | AVAILTUNES += "x86-64-x32" |
46 | TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" | 46 | TUNE_FEATURES_tune-x86-64-x32 ?= "mx32" |
47 | BASE_LIB_tune-x86-64-x32 ?= "lib" | 47 | BASE_LIB_tune-x86-64-x32 ?= "libx32" |
48 | PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32" | 48 | PACKAGE_EXTRA_ARCHS_tune-x86-64-x32 = "x86_64-x32" |
49 | TUNE_PKGARCH .= "${@bb.utils.contains("TUNE_FEATURES", "mx32", "-x32", "", d)}" | 49 | TUNE_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 | ||
21 | AVAILTUNES += "core2-64-x32" | 21 | AVAILTUNES += "core2-64-x32" |
22 | TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2" | 22 | TUNE_FEATURES_tune-core2-64-x32 ?= "${TUNE_FEATURES_tune-x86-64-x32} core2" |
23 | BASE_LIB_tune-core2-64-x32 ?= "lib" | 23 | BASE_LIB_tune-core2-64-x32 ?= "libx32" |
24 | PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32" | 24 | PACKAGE_EXTRA_ARCHS_tune-core2-64-x32 = "${PACKAGE_EXTRA_ARCHS_tune-x86-64-x32} core2-64-x32" |