diff options
| author | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2022-04-23 19:40:24 -0500 |
|---|---|---|
| committer | Muhammad Moinur Rahman <bofh@FreeBSD.org> | 2022-04-23 19:40:24 -0500 |
| commit | 7eac6b77c16b3a2552a94e0f14e6fcf471e27a9e (patch) | |
| tree | 79e8ce3b0d74e67cbb3902779bfdc904e2a4f955 /emulators/qemu/files/patch-meson.build | |
| parent | net/phpldapadmin: Use predefined commands (diff) | |
emulators/qemu: Update version 6.2.0=>7.0.0
Users who want to stick with 6.X branch please check UPDATING or use
qemu6. As previous qemu comes with three flavors: the default with X11
support, -nox11 without X11 support and -tools which instals only a
subset of entire qemu.
Relnotes: https://wiki.qemu.org/ChangeLog/7.0
Diffstat (limited to 'emulators/qemu/files/patch-meson.build')
| -rw-r--r-- | emulators/qemu/files/patch-meson.build | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/emulators/qemu/files/patch-meson.build b/emulators/qemu/files/patch-meson.build index 5359dd16ef0e..e701a096e957 100644 --- a/emulators/qemu/files/patch-meson.build +++ b/emulators/qemu/files/patch-meson.build @@ -1,7 +1,7 @@ ---- meson.build.orig 2021-12-10 18:55:23 UTC +--- meson.build.orig 2022-04-19 19:10:27 UTC +++ meson.build -@@ -1901,14 +1901,10 @@ fdt_opt = get_option('fdt') - if have_system +@@ -2505,14 +2505,10 @@ if have_system + fdt_opt = get_option('fdt') if fdt_opt in ['enabled', 'auto', 'system'] have_internal = fs.exists(meson.current_source_dir() / 'dtc/libfdt/Makefile.libfdt') - fdt = cc.find_library('fdt', kwargs: static_kwargs, @@ -11,10 +11,10 @@ - if fdt.found() and cc.links(''' - #include <libfdt.h> - #include <libfdt_env.h> -- int main(void) { fdt_check_full(NULL, 0); return 0; }''', +- int main(void) { fdt_find_max_phandle(NULL, NULL); return 0; }''', - dependencies: fdt) -+ fdt_opt == 'enabled' ) ++ fdt_opt == 'enabled') + if fdt.found() fdt_opt = 'system' - elif have_internal - fdt_opt = 'internal' + elif fdt_opt == 'system' + error('system libfdt requested, but it is too old (1.5.1 or newer required)') |