diff options
| author |   Matthias Maier <tamiko@gentoo.org> | 2023-05-05 12:38:34 -0500 |
|---|---|---|
| committer | Matthias Maier <tamiko@gentoo.org> | 2023-05-05 13:11:18 -0500 |
| commit | 4d673acc71014d69e776c5e1e737bd2d1eb8d055 (patch) | |
| tree | a995e6843adc48d920dd04d2cfc6a5f627790536 /app-emulation | |
| parent | app-emulation/qemu: add 8.0.0 (diff) | |
| download | gentoo-4d673acc71014d69e776c5e1e737bd2d1eb8d055.tar.gz gentoo-4d673acc71014d69e776c5e1e737bd2d1eb8d055.tar.bz2 gentoo-4d673acc71014d69e776c5e1e737bd2d1eb8d055.zip | |
app-emulation/qemu: fix configure
Version 8.0.0 complains about not using internal meson when conifguring.
For the time being, simply disable the check. We should fix this
properly, though.
Signed-off-by: Matthias Maier <tamiko@gentoo.org>
Diffstat (limited to 'app-emulation')
| -rw-r--r-- | app-emulation/qemu/files/qemu-8.0.0-remove-python-meson-check.patch | 40 | ||||
| -rw-r--r-- | app-emulation/qemu/qemu-8.0.0.ebuild | 1 |
2 files changed, 41 insertions, 0 deletions
diff --git a/app-emulation/qemu/files/qemu-8.0.0-remove-python-meson-check.patch b/app-emulation/qemu/files/qemu-8.0.0-remove-python-meson-check.patch new file mode 100644 index 000000000000..07d3836c57e4 --- /dev/null +++ b/app-emulation/qemu/files/qemu-8.0.0-remove-python-meson-check.patch @@ -0,0 +1,40 @@ +diff --git a/configure b/configure +index 4369fa5..7807ad5 100755 +--- a/configure ++++ b/configure +@@ -1095,34 +1095,7 @@ has_meson() { + fi + } + +-if test -z "$meson"; then +- if test "$explicit_python" = no && has_meson && version_ge "$(meson --version)" 0.61.5; then +- meson=meson +- elif test "$git_submodules_action" != 'ignore' ; then +- meson=git +- elif test -e "${source_path}/meson/meson.py" ; then +- meson=internal +- else +- if test "$explicit_python" = yes; then +- error_exit "--python requires using QEMU's embedded Meson distribution, but it was not found." +- else +- 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 ++meson=meson + + if test "$meson" = git; then + git_submodules="${git_submodules} meson" diff --git a/app-emulation/qemu/qemu-8.0.0.ebuild b/app-emulation/qemu/qemu-8.0.0.ebuild index 76c3d4ecfbfc..3048bf51382f 100644 --- a/app-emulation/qemu/qemu-8.0.0.ebuild +++ b/app-emulation/qemu/qemu-8.0.0.ebuild @@ -308,6 +308,7 @@ PATCHES=( "${FILESDIR}"/${PN}-7.1.0-also-build-virtfs-proxy-helper.patch "${FILESDIR}"/${PN}-7.1.0-capstone-include-path.patch "${FILESDIR}"/${PN}-7.2.0-disable-gmp.patch + "${FILESDIR}"/${PN}-8.0.0-remove-python-meson-check.patch ) QA_PREBUILT=" |