From: Thomas Huth <thuth@redhat.com>
Date: Fri, 27 Aug 2021 12:09:00 +0000 (+0200)
Subject: meson.build: Don't use internal libfdt if the user requested the system libfdt
X-Git-Tag: v6.2.0-rc0~115^2~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c22853c733efd0a3d243bab48f8af66588f4a7a;p=thirdparty%2Fqemu.git

meson.build: Don't use internal libfdt if the user requested the system libfdt

If the users ran configure with --enable-libfdt=system, they likely did
that on purpose. We should not silently fall back to the internal libfdt
if the system libfdt is not usable, but report the problem with a proper
message instead.

Message-Id: <20210827120901.150276-3-thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---

diff --git a/meson.build b/meson.build
index 6f7177428ef..ecfdce921cd 100644
--- a/meson.build
+++ b/meson.build
@@ -1912,6 +1912,8 @@ if have_system
        int main(void) { fdt_check_full(NULL, 0); return 0; }''',
          dependencies: fdt)
       fdt_opt = 'system'
+    elif fdt_opt == 'system'
+       error('system libfdt requested, but it is too old (1.5.1 or newer required)')
     elif have_internal
       fdt_opt = 'internal'
     else