| From 76c3fc4c87231bed32974ebbbdb5079cff45a6b7 Mon Sep 17 00:00:00 2001 |
| From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| Date: Tue, 5 Jan 2021 23:00:14 +0000 |
| Subject: [PATCH 12/12] qemu: Upgrade 5.1.0->5.2.0 |
| |
| We need to be able to trigger configure's cross code but we don't want |
| to set cross_prefix as it does other things we don't want. Patch things |
| so we can do what we need in the target config case. |
| |
| Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] |
| Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| |
| --- |
| configure | 4 ---- |
| 1 file changed, 4 deletions(-) |
| |
| Index: qemu-7.1.0/configure |
| =================================================================== |
| --- qemu-7.1.0.orig/configure |
| +++ qemu-7.1.0/configure |
| @@ -2710,7 +2710,6 @@ if test "$skip_meson" = no; then |
| echo "strip = [$(meson_quote $strip)]" >> $cross |
| echo "widl = [$(meson_quote $widl)]" >> $cross |
| echo "windres = [$(meson_quote $windres)]" >> $cross |
| - if test "$cross_compile" = "yes"; then |
| cross_arg="--cross-file config-meson.cross" |
| echo "[host_machine]" >> $cross |
| echo "system = '$targetos'" >> $cross |
| @@ -2728,9 +2727,6 @@ if test "$skip_meson" = no; then |
| else |
| echo "endian = 'little'" >> $cross |
| fi |
| - else |
| - cross_arg="--native-file config-meson.cross" |
| - fi |
| mv $cross config-meson.cross |
| |
| rm -rf meson-private meson-info meson-logs |