blob: bdb77ec7d01c4d7679e61605e306c277e3124aca [file] [log] [blame]
Andrew Geisslereff27472021-10-29 15:35:00 -05001From f51ece86f84c877f255746cba22a6745f37d2b7f Mon Sep 17 00:00:00 2001
2From: Richard Purdie <richard.purdie@linuxfoundation.org>
3Date: Tue, 5 Jan 2021 23:00:14 +0000
4Subject: [PATCH] qemu: Upgrade 5.1.0->5.2.0
5
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 Geisslereff27472021-10-29 15:35:00 -050012---
13 configure | 4 ----
14 1 file changed, 4 deletions(-)
Andrew Geisslerd1e89492021-02-12 15:35:20 -060015
Andrew Geisslereff27472021-10-29 15:35:00 -050016diff --git a/configure b/configure
17index 9a79a004d..563b7827f 100755
18--- a/configure
19+++ b/configure
20@@ -5128,7 +5128,6 @@ if test "$skip_meson" = no; then
21 fi
22 echo "strip = [$(meson_quote $strip)]" >> $cross
23 echo "windres = [$(meson_quote $windres)]" >> $cross
24- if test "$cross_compile" = "yes"; then
Andrew Geisslerd1e89492021-02-12 15:35:20 -060025 cross_arg="--cross-file config-meson.cross"
26 echo "[host_machine]" >> $cross
27 if test "$mingw32" = "yes" ; then
Andrew Geisslereff27472021-10-29 15:35:00 -050028@@ -5160,9 +5159,6 @@ if test "$skip_meson" = no; then
Andrew Geisslerd1e89492021-02-12 15:35:20 -060029 else
30 echo "endian = 'little'" >> $cross
31 fi
Andrew Geisslereff27472021-10-29 15:35:00 -050032- else
Andrew Geisslerd1e89492021-02-12 15:35:20 -060033- cross_arg="--native-file config-meson.cross"
Andrew Geisslereff27472021-10-29 15:35:00 -050034- fi
35 mv $cross config-meson.cross
Andrew Geisslerd1e89492021-02-12 15:35:20 -060036
Andrew Geisslereff27472021-10-29 15:35:00 -050037 rm -rf meson-private meson-info meson-logs
38--
392.17.1
40