Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 1 | From f51ece86f84c877f255746cba22a6745f37d2b7f Mon Sep 17 00:00:00 2001 |
| 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Tue, 5 Jan 2021 23:00:14 +0000 |
| 4 | Subject: [PATCH] qemu: Upgrade 5.1.0->5.2.0 |
| 5 | |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 6 | We need to be able to trigger configure's cross code but we don't want |
| 7 | to set cross_prefix as it does other things we don't want. Patch things |
| 8 | so we can do what we need in the target config case. |
| 9 | |
| 10 | Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] |
| 11 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 12 | --- |
| 13 | configure | 4 ---- |
| 14 | 1 file changed, 4 deletions(-) |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 15 | |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 16 | diff --git a/configure b/configure |
| 17 | index 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 Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 25 | cross_arg="--cross-file config-meson.cross" |
| 26 | echo "[host_machine]" >> $cross |
| 27 | if test "$mingw32" = "yes" ; then |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 28 | @@ -5160,9 +5159,6 @@ if test "$skip_meson" = no; then |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 29 | else |
| 30 | echo "endian = 'little'" >> $cross |
| 31 | fi |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 32 | - else |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 33 | - cross_arg="--native-file config-meson.cross" |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 34 | - fi |
| 35 | mv $cross config-meson.cross |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 36 | |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame^] | 37 | rm -rf meson-private meson-info meson-logs |
| 38 | -- |
| 39 | 2.17.1 |
| 40 | |