[PULL,08/13] meson.build: Don't use internal libfdt if the user requested the system libfdt

Commit Message

Thomas Huth Sept. 2, 2021, 12:49 p.m. UTC

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: <[e-mail]>
Reviewed-by: Philippe Mathieu-Daudé <[e-mail]>
Reviewed-by: Marc-André Lureau <[e-mail]>
Signed-off-by: Thomas Huth <[e-mail]>
---
 meson.build | 2 ++
 1 file changed, 2 insertions(+)

Patch

diff --git a/meson.build b/meson.build
index 6f7177428e..ecfdce921c 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