Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 1 | From 76c3fc4c87231bed32974ebbbdb5079cff45a6b7 Mon Sep 17 00:00:00 2001 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 2 | From: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 3 | Date: Tue, 5 Jan 2021 23:00:14 +0000 |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 4 | Subject: [PATCH 12/12] qemu: Upgrade 5.1.0->5.2.0 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 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 | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 12 | |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 13 | --- |
| 14 | configure | 4 ---- |
| 15 | 1 file changed, 4 deletions(-) |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 16 | |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 17 | diff --git a/configure b/configure |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 18 | index 7c08c1835..0613279f9 100755 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 19 | --- a/configure |
| 20 | +++ b/configure |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 21 | @@ -3118,7 +3118,6 @@ if test "$skip_meson" = no; then |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 22 | fi |
| 23 | echo "strip = [$(meson_quote $strip)]" >> $cross |
| 24 | echo "windres = [$(meson_quote $windres)]" >> $cross |
| 25 | - if test "$cross_compile" = "yes"; then |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 26 | cross_arg="--cross-file config-meson.cross" |
| 27 | echo "[host_machine]" >> $cross |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 28 | echo "system = '$targetos'" >> $cross |
| 29 | @@ -3136,9 +3135,6 @@ if test "$skip_meson" = no; then |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 30 | else |
| 31 | echo "endian = 'little'" >> $cross |
| 32 | fi |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 33 | - else |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 34 | - cross_arg="--native-file config-meson.cross" |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 35 | - fi |
| 36 | mv $cross config-meson.cross |
Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 37 | |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 38 | rm -rf meson-private meson-info meson-logs |
| 39 | -- |
Andrew Geissler | d583833 | 2022-05-27 11:33:10 -0500 | [diff] [blame^] | 40 | 2.30.2 |
Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 41 | |