| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 1 | We need to be able to trigger configure's cross code but we don't want |
| 2 | to set cross_prefix as it does other things we don't want. Patch things |
| 3 | so we can do what we need in the target config case. |
| 4 | |
| 5 | Upstream-Status: Inappropriate [may be rewritten in a way upstream may accept?] |
| 6 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
| 7 | |
| 8 | |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 9 | Index: qemu-6.0.0/configure |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 10 | =================================================================== |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 11 | --- qemu-6.0.0.orig/configure |
| 12 | +++ qemu-6.0.0/configure |
| 13 | @@ -6371,7 +6371,6 @@ if has $sdl2_config; then |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 14 | fi |
| 15 | echo "strip = [$(meson_quote $strip)]" >> $cross |
| 16 | echo "windres = [$(meson_quote $windres)]" >> $cross |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 17 | -if test "$cross_compile" = "yes"; then |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 18 | cross_arg="--cross-file config-meson.cross" |
| 19 | echo "[host_machine]" >> $cross |
| 20 | if test "$mingw32" = "yes" ; then |
| William A. Kennington III | ac69b48 | 2021-06-02 12:28:27 -0700 | [diff] [blame] | 21 | @@ -6403,9 +6402,6 @@ if test "$cross_compile" = "yes"; then |
| Andrew Geissler | d1e8949 | 2021-02-12 15:35:20 -0600 | [diff] [blame] | 22 | else |
| 23 | echo "endian = 'little'" >> $cross |
| 24 | fi |
| 25 | -else |
| 26 | - cross_arg="--native-file config-meson.cross" |
| 27 | -fi |
| 28 | mv $cross config-meson.cross |
| 29 | |
| 30 | rm -rf meson-private meson-info meson-logs |