aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-09 17:02:09 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-03-12 22:11:19 +0000
commit04ecebd4a79f80c5bb054a8b21df6f555631ed8b (patch)
tree42150ae58810b618c8ea8890f1034572a54c922f
parent7eb19aa29f40c10b0ed9e9c384652dbc9d185088 (diff)
downloadopenembedded-core-contrib-04ecebd4a79f80c5bb054a8b21df6f555631ed8b.tar.gz
openembedded-core-contrib-04ecebd4a79f80c5bb054a8b21df6f555631ed8b.tar.bz2
openembedded-core-contrib-04ecebd4a79f80c5bb054a8b21df6f555631ed8b.zip
machine/include/arch-x86: Make x32 ABI not supporting gobject-introspection-data
x32 isn't supported by user mode qemu so we can't build gobject-introspection-data, so disable it in this case. (From OE-Core rev: 4ee1eb8ddd3fbe144fbaeb32e07b66e191aa7548) Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/conf/machine/include/x86/arch-x86.inc2
1 files changed, 2 insertions, 0 deletions
diff --git a/meta/conf/machine/include/x86/arch-x86.inc b/meta/conf/machine/include/x86/arch-x86.inc
index 400da1a39ff..ba7be8ad655 100644
--- a/meta/conf/machine/include/x86/arch-x86.inc
+++ b/meta/conf/machine/include/x86/arch-x86.inc
@@ -24,6 +24,8 @@ ABIEXTENSION .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'x32', '' ,d)}"
TUNE_CCARGS .= "${@bb.utils.contains('TUNE_FEATURES', 'mx32', ' -mx32', '', d)}"
TUNE_LDARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-m elf32_x86_64', '', d)}"
TUNE_ASARGS += "${@bb.utils.contains('TUNE_FEATURES', 'mx32', '-x32', '', d)}"
+# user mode qemu doesn't support x32
+MACHINE_FEATURES_BACKFILL_CONSIDERED_append = " ${@bb.utils.contains('TUNE_FEATURES', 'mx32', 'gobject-introspection-data', '', d)}"
# ELF64 ABI
TUNEVALID[m64] = "IA32e (x86_64) ELF64 standard ABI"