blob: d1256a12294589d04276344929c0883376f252ba [file] [log] [blame]
Andrew Geisslerd5838332022-05-27 11:33:10 -05001From 76c3fc4c87231bed32974ebbbdb5079cff45a6b7 Mon Sep 17 00:00:00 2001
Andrew Geisslereff27472021-10-29 15:35:00 -05002From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 5 Jan 2021 23:00:14 +0000
Andrew Geisslerd5838332022-05-27 11:33:10 -05004Subject: [PATCH 12/12] qemu: Upgrade 5.1.0->5.2.0
Andrew Geisslereff27472021-10-29 15:35:00 -05005
Andrew Geisslerd1e89492021-02-12 15:35:20 -06006We need to be able to trigger configure's cross code but we don't want
7to set cross_prefix as it does other things we don't want. Patch things
8so we can do what we need in the target config case.
9
10Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?]
11Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Andrew Geisslerd5838332022-05-27 11:33:10 -050012
Andrew Geisslereff27472021-10-29 15:35:00 -050013---
14 configure | 4 ----
15 1 file changed, 4 deletions(-)
Andrew Geisslerd1e89492021-02-12 15:35:20 -060016
Andrew Geisslereff27472021-10-29 15:35:00 -050017diff --git a/configure b/configure
Andrew Geisslerd5838332022-05-27 11:33:10 -050018index 7c08c1835..0613279f9 100755
Andrew Geisslereff27472021-10-29 15:35:00 -050019--- a/configure
20+++ b/configure
Andrew Geisslerd5838332022-05-27 11:33:10 -050021@@ -3118,7 +3118,6 @@ if test "$skip_meson" = no; then
Andrew Geisslereff27472021-10-29 15:35:00 -050022 fi
23 echo "strip = [$(meson_quote $strip)]" >> $cross
24 echo "windres = [$(meson_quote $windres)]" >> $cross
25- if test "$cross_compile" = "yes"; then
Andrew Geisslerd1e89492021-02-12 15:35:20 -060026 cross_arg="--cross-file config-meson.cross"
27 echo "[host_machine]" >> $cross
Andrew Geisslerd5838332022-05-27 11:33:10 -050028 echo "system = '$targetos'" >> $cross
29@@ -3136,9 +3135,6 @@ if test "$skip_meson" = no; then
Andrew Geisslerd1e89492021-02-12 15:35:20 -060030 else
31 echo "endian = 'little'" >> $cross
32 fi
Andrew Geisslereff27472021-10-29 15:35:00 -050033- else
Andrew Geisslerd1e89492021-02-12 15:35:20 -060034- cross_arg="--native-file config-meson.cross"
Andrew Geisslereff27472021-10-29 15:35:00 -050035- fi
36 mv $cross config-meson.cross
Andrew Geisslerd1e89492021-02-12 15:35:20 -060037
Andrew Geisslereff27472021-10-29 15:35:00 -050038 rm -rf meson-private meson-info meson-logs
39--
Andrew Geisslerd5838332022-05-27 11:33:10 -0500402.30.2
Andrew Geisslereff27472021-10-29 15:35:00 -050041