summaryrefslogtreecommitdiffstats
path: root/meta/recipes-devtools
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2018-06-11 11:44:33 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-06-15 17:56:24 +0100
commitd7c5ae6ea9362e2c5449c91e590fc388456b0115 (patch)
tree601751984ae12c1e0887753fc31fd34ffb1bc5b8 /meta/recipes-devtools
parent041041609e45a9a6c4c18746efd9368ca789242e (diff)
downloadpoky-d7c5ae6ea9362e2c5449c91e590fc388456b0115.tar.gz
qemu: don't inherit autotools
qemu doesn't use autotools, so don't inherit it and just call 'make install' directly. No need to alter makefiles anymore, as they appear to respect CFLAGS now. Remove a chmod of beginend_funcs.sh (a file we patched in, and removed, many years ago). (From OE-Core rev: b52a9d108d72ebdf93f2dc51aa6f26ccc890d451) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
-rw-r--r--meta/recipes-devtools/qemu/qemu.inc15
1 files changed, 6 insertions, 9 deletions
diff --git a/meta/recipes-devtools/qemu/qemu.inc b/meta/recipes-devtools/qemu/qemu.inc
index faaea781cd..094a975177 100644
--- a/meta/recipes-devtools/qemu/qemu.inc
+++ b/meta/recipes-devtools/qemu/qemu.inc
@@ -5,7 +5,7 @@ DEPENDS = "glib-2.0 zlib pixman"
5RDEPENDS_${PN}_class-target += "bash" 5RDEPENDS_${PN}_class-target += "bash"
6 6
7require qemu-targets.inc 7require qemu-targets.inc
8inherit autotools pkgconfig bluetooth 8inherit pkgconfig bluetooth
9BBCLASSEXTEND = "native nativesdk" 9BBCLASSEXTEND = "native nativesdk"
10 10
11# QEMU_TARGETS is overridable variable 11# QEMU_TARGETS is overridable variable
@@ -27,6 +27,7 @@ EXTRA_OECONF = " \
27 --disable-werror \ 27 --disable-werror \
28 --target-list=${@get_qemu_target_list(d)} \ 28 --target-list=${@get_qemu_target_list(d)} \
29 --extra-cflags='${CFLAGS}' \ 29 --extra-cflags='${CFLAGS}' \
30 ${PACKAGECONFIG_CONFARGS} \
30 " 31 "
31EXTRA_OECONF_append_class-native = " --python=python2.7" 32EXTRA_OECONF_append_class-native = " --python=python2.7"
32 33
@@ -36,27 +37,23 @@ LDFLAGS_append_class-native = " -fuse-ld=bfd"
36 37
37export LIBTOOL="${HOST_SYS}-libtool" 38export LIBTOOL="${HOST_SYS}-libtool"
38 39
40B = "${WORKDIR}/build"
41
39do_configure_prepend_class-native() { 42do_configure_prepend_class-native() {
40 # Append build host pkg-config paths for native target since the host may provide sdl 43 # Append build host pkg-config paths for native target since the host may provide sdl
41 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "") 44 BHOST_PKGCONFIG_PATH=$(PATH=/usr/bin:/bin pkg-config --variable pc_path pkg-config || echo "")
42 if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then 45 if [ ! -z "$BHOST_PKGCONFIG_PATH" ]; then
43 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH 46 export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$BHOST_PKGCONFIG_PATH
44 fi 47 fi
45
46 # Alter target makefiles to accept CFLAGS set via env
47 sed -i -r \
48 -e 's/^(C|OP_C|HELPER_C)FLAGS=/\1FLAGS+=/' \
49 "${S}"/Makefile "${S}"/Makefile.target
50} 48}
51 49
52do_configure() { 50do_configure() {
53 ${S}/configure ${EXTRA_OECONF} 51 ${S}/configure ${EXTRA_OECONF}
54 test ! -e ${S}/target-i386/beginend_funcs.sh || chmod a+x ${S}/target-i386/beginend_funcs.sh
55} 52}
56 53
57do_install () { 54do_install () {
58 export STRIP="true" 55 export STRIP=""
59 autotools_do_install 56 oe_runmake 'DESTDIR=${D}' install
60} 57}
61 58
62# The following fragment will create a wrapper for qemu-mips user emulation 59# The following fragment will create a wrapper for qemu-mips user emulation