aboutsummaryrefslogtreecommitdiffstats
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:13:47 +0000
commit9d908f6369e938f1da4456dbc07c64f328656182 (patch)
tree9794b00da6662854d8bc6655ff72649290b6838f
parent0aca9b735c6f9d7ffe2826e624942a563c501d1f (diff)
downloadopenembedded-core-contrib-9d908f6369e938f1da4456dbc07c64f328656182.tar.gz
openembedded-core-contrib-9d908f6369e938f1da4456dbc07c64f328656182.tar.bz2
openembedded-core-contrib-9d908f6369e938f1da4456dbc07c64f328656182.zip
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. Signed-off-by: Nathan Rossi <nathan@nathanrossi.com>
-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 = "\
file://cpus.c-qemu_cpu_kick_thread_debugging.patch \
"
-EXTRA_OECONF += "--target-list=${@get_qemu_target_list(d)} --disable-werror --with-system-pixman --extra-cflags='${CFLAGS}'"
-
-EXTRA_OECONF_class-nativesdk = "--target-list=${@get_qemu_target_list(d)} --disable-werror"
+EXTRA_OECONF = " \
+ --prefix=${prefix} \
+ --bindir=${bindir} \
+ --includedir=${includedir} \
+ --libdir=${libdir} \
+ --mandir=${mandir} \
+ --datadir=${datadir} \
+ --docdir=${docdir}/${BPN} \
+ --sysconfdir=${sysconfdir} \
+ --libexecdir=${libexecdir} \
+ --localstatedir=${localstatedir} \
+ --with-confsuffix=/${BPN} \
+ --disable-strip \
+ --disable-werror \
+ --target-list=${@get_qemu_target_list(d)} \
+ --with-system-pixman \
+ --extra-cflags='${CFLAGS}' \
+ "
EXTRA_OECONF_append_class-native = " --python=${USRBINPATH}/python2"
EXTRA_OEMAKE_append_class-native = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'"
@@ -62,7 +77,7 @@ do_configure() {
KVMOPTS="${KVMENABLE}"
fi
- ${S}/configure --prefix=${prefix} --sysconfdir=${sysconfdir} --libexecdir=${libexecdir} --localstatedir=${localstatedir} --disable-strip ${EXTRA_OECONF} $KVMOPTS
+ ${S}/configure ${EXTRA_OECONF} $KVMOPTS
test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh
}