summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNathan Rossi <nathan@nathanrossi.com>2017-01-02 16:57:23 +1000
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-03-08 11:52:57 +0000
commit6e7a2f0ba3a1426e1dff9b049a1281cb9517dd6e (patch)
treeac927e8add01ad0a385b18795481259b727c644b
parent7065bb2148fe171c71aeac63ce247513216d17e4 (diff)
downloadpoky-6e7a2f0ba3a1426e1dff9b049a1281cb9517dd6e.tar.gz
qemu: Consolidate EXTRA_OECONF
Consolidate the configure options into the EXTRA_OECONF variable, including merging any native(sdk) specific options. This consolidation also makes the use of 'system' pixman in the nativesdk case, this is desirable as the QEMU internal pixman may not be available (using QEMU git as opposed to tarball) and pixman is already in DEPENDS. Additionally the QEMU configure recommends to use the system pixman if available. Additionally move the options specified in the do_configure into the EXTRA_OECONF variable. And flesh out all the target directories. (From OE-Core rev: 9d908f6369e938f1da4456dbc07c64f328656182) Signed-off-by: Nathan Rossi <nathan@nathanrossi.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc23
1 files changed, 19 insertions, 4 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 1857786917..72430cc6fd 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -26,9 +26,24 @@ SRC_URI_append_class-native = "\
26 file://cpus.c-qemu_cpu_kick_thread_debugging.patch \ 26 file://cpus.c-qemu_cpu_kick_thread_debugging.patch \
27 " 27 "
28 28
29EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --with-system-pixman --extra-cflags='${CFLAGS}'" 29EXTRA_OECONF = " \
30 30 --prefix=${prefix} \
31EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror" 31 --bindir=${bindir} \
32 --includedir=${includedir} \
33 --libdir=${libdir} \
34 --mandir=${mandir} \
35 --datadir=${datadir} \
36 --docdir=${docdir}/${BPN} \
37 --sysconfdir=${sysconfdir} \
38 --libexecdir=${libexecdir} \
39 --localstatedir=${localstatedir} \
40 --with-confsuffix=/${BPN} \
41 --disable-strip \
42 --disable-werror \
43 --target-list=${@get_qemu_target_list(d)} \
44 --with-system-pixman \
45 --extra-cflags='${CFLAGS}' \
46 "
32EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2" 47EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2"
33 48
34EXTRA_OEMAKE_append_class-native = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" 49EXTRA_OEMAKE_append_class-native = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'"
@@ -62,7 +77,7 @@ do_configure() {
62 KVMOPTS="${KVMENABLE}" 77 KVMOPTS="${KVMENABLE}"
63 fi 78 fi
64 79
65 ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --localstatedir=${localstatedir} --disable-strip ${EXTRA_OECONF} $KVMOPTS 80 ${S}/configure ${EXTRA_OECONF} $KVMOPTS
66 test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh 81 test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh
67} 82}
68 83