Google Git
Sign in
qemu / qemu / 973038db87154f954e8cd889d706089489a43d46
commit973038db87154f954e8cd889d706089489a43d46[log] [tgz]
authorPaolo Bonzini <pbonzini@redhat.com>Fri May 19 20:04:07 2023 +0200
committerPaolo Bonzini <pbonzini@redhat.com>Fri May 19 20:40:04 2023 +0200
treeb7bc78bac96a9eadd024f87ccb13f5a01a07498e
parentb0fcc6fc7fc11278c8ca344d8d9c6e5d05742f79 [diff]
configure: fix backwards-compatibility for meson sphinx_build option

Reintroduce the cmd_line.txt mangling to remove the sphinx_build option
when rerunning meson.  The mechanism was removed in commit 75cc28648574
("configure: remove backwards-compatibility code", 2023-01-11) because
the fixups were obsolete at the time; however, the Meson deprecation
mechanism doesn't quite work when options are finally removed, so we
need to bring it back.

Reported-by: Peter Maydell <peter.maydell@linaro.org>
Tested-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
1 file changed
tree: b7bc78bac96a9eadd024f87ccb13f5a01a07498e
  1. .github/
  2. .gitlab/
  3. .gitlab-ci.d/
  4. accel/
  5. audio/
  6. authz/
  7. backends/
  8. block/
  9. bsd-user/
  10. chardev/
  11. common-user/
  12. configs/
  13. contrib/
  14. crypto/
  15. disas/
  16. docs/
  17. dump/
  18. ebpf/
  19. fpu/
  20. fsdev/
  21. gdb-xml/
  22. gdbstub/
  23. hw/
  24. include/
  25. io/
  26. libdecnumber/
  27. linux-headers/
  28. linux-user/
  29. migration/
  30. monitor/
  31. nbd/
  32. net/
  33. pc-bios/
  34. plugins/
  35. po/
  36. python/
  37. qapi/
  38. qga/
  39. qobject/
  40. qom/
  41. replay/
  42. roms/
  43. scripts/
  44. scsi/
  45. semihosting/
  46. softmmu/
  47. stats/
  48. storage-daemon/
  49. stubs/
  50. subprojects/
  51. target/
  52. tcg/
  53. tests/
  54. tools/
  55. trace/
  56. ui/
  57. util/
  58. dtc
  59. .dir-locals.el
  60. .editorconfig
  61. .exrc
  62. .gdbinit
  63. .git-blame-ignore-revs
  64. .gitattributes
  65. .gitignore
  66. .gitlab-ci.yml
  67. .gitmodules
  68. .gitpublish
  69. .mailmap
  70. .patchew.yml
  71. .readthedocs.yml
  72. .travis.yml
  73. block.c
  74. blockdev-nbd.c
  75. blockdev.c
  76. blockjob.c
  77. configure
  78. COPYING
  79. COPYING.LIB
  80. cpu.c
  81. cpus-common.c
  82. event-loop-base.c
  83. gitdm.config
  84. hmp-commands-info.hx
  85. hmp-commands.hx
  86. iothread.c
  87. job-qmp.c
  88. job.c
  89. Kconfig
  90. Kconfig.host
  91. LICENSE
  92. MAINTAINERS
  93. Makefile
  94. memory_ldst.c.inc
  95. meson.build
  96. meson_options.txt
  97. module-common.c
  98. os-posix.c
  99. os-win32.c
  100. page-vary-common.c
  101. page-vary.c
  102. qemu-bridge-helper.c
  103. qemu-edid.c
  104. qemu-img-cmds.hx
  105. qemu-img.c
  106. qemu-io-cmds.c
  107. qemu-io.c
  108. qemu-keymap.c
  109. qemu-nbd.c
  110. qemu-options.hx
  111. qemu.nsi
  112. qemu.sasl
  113. README.rst
  114. replication.c
  115. trace-events
  116. VERSION
  117. version.rc