summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2019-07-12 00:54:31 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-07-15 09:30:00 +0100
commitd19cbe3af5b104e4d11bf91e62c2ce8a508e2565 (patch)
tree094eb52012f56fc9a5612fc4ab28e40f5dd1a8fa
parente79615e786dd2e54e71ef8a6450ef785a8b471dd (diff)
downloadpoky-d19cbe3af5b104e4d11bf91e62c2ce8a508e2565.tar.gz
qemu: use Python 3 to build
As part of the mission to remove the use of Python 2, explicitly use Python 3 when building qemu. (From OE-Core rev: 9b3ed6f7ab8bf56a05a074162ed37ead12f248cf) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/qemu/qemu-native.inc1
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/meta/recipes-devtools/qemu/qemu-native.inc b/meta/recipes-devtools/qemu/qemu-native.inc
index 34ab8e6401..c04297cad0 100644
--- a/meta/recipes-devtools/qemu/qemu-native.inc
+++ b/meta/recipes-devtools/qemu/qemu-native.inc
@@ -6,7 +6,6 @@ SRC_URI_append = " \
6 file://0011-fix-libcap-header-issue-on-some-distro.patch \ 6 file://0011-fix-libcap-header-issue-on-some-distro.patch \
7 file://0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \ 7 file://0012-cpus.c-Add-error-messages-when-qemi_cpu_kick_thread-.patch \
8 " 8 "
9EXTRA_OECONF_append = " --python=python2.7"
10 9
11EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'" 10EXTRA_OEMAKE_append = " LD='${LD}' AR='${AR}' OBJCOPY='${OBJCOPY}' LDFLAGS='${LDFLAGS}'"
12 11
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index 32379708e4..dfe17eed8b 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -77,6 +77,8 @@ export LIBTOOL="${HOST_SYS}-libtool"
77 77
78B = "${WORKDIR}/build" 78B = "${WORKDIR}/build"
79 79
80EXTRA_OECONF_append = " --python=${HOSTTOOLS_DIR}/python3"
81
80do_configure_prepend_class-native() { 82do_configure_prepend_class-native() {
81 # Append build host pkg-config paths for native target since the host may provide sdl 83 # Append build host pkg-config paths for native target since the host may provide sdl
82 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") 84 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")