diff options
| author | Gleb Popov <arrowd@FreeBSD.org> | 2021-07-21 12:15:37 +0300 |
|---|---|---|
| committer | Gleb Popov <arrowd@FreeBSD.org> | 2021-08-04 20:25:43 +0300 |
| commit | b0f48fa9e9495ee59a2bf13d0e9cc2b91e589049 (patch) | |
| tree | 7af12a2e94a8cc6a205aafa167167f43eaee80da /emulators/qemu-user-static-devel/files/patch-configure | |
| parent | multimedia/minisatip: Update to 1.1.37 (diff) | |
emulators/qemu-user-static-devel: Update to the newest snapshot.
This updates the port to the tip of `blitz-next` branch and enables `make test`.
Approved by: mat
Differential Revision: https://reviews.freebsd.org/D31255
Diffstat (limited to 'emulators/qemu-user-static-devel/files/patch-configure')
| -rw-r--r-- | emulators/qemu-user-static-devel/files/patch-configure | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/emulators/qemu-user-static-devel/files/patch-configure b/emulators/qemu-user-static-devel/files/patch-configure new file mode 100644 index 000000000000..143a20b5b707 --- /dev/null +++ b/emulators/qemu-user-static-devel/files/patch-configure @@ -0,0 +1,22 @@ +--- configure.orig 2021-05-11 21:34:33 UTC ++++ configure +@@ -1964,19 +1964,6 @@ if test -z "$meson"; then + error_exit "Meson not found. Use --meson=/path/to/meson" + fi + fi +-else +- # Meson uses its own Python interpreter to invoke other Python scripts, +- # but the user wants to use the one they specified with --python. +- # +- # We do not want to override the distro Python interpreter (and sometimes +- # cannot: for example in Homebrew /usr/bin/meson is a bash script), so +- # just require --meson=git|internal together with --python. +- if test "$explicit_python" = yes; then +- case "$meson" in +- git | internal) ;; +- *) error_exit "--python requires using QEMU's embedded Meson distribution." ;; +- esac +- fi + fi + + if test "$meson" = git; then |