[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/13] meson.build: Don't use internal libfdt if the user requeste
From: |
Thomas Huth |
Subject: |
[PULL 08/13] meson.build: Don't use internal libfdt if the user requested the system libfdt |
Date: |
Thu, 2 Sep 2021 14:49:06 +0200 |
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>
---
meson.build | 2 ++
1 file changed, 2 insertions(+)
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
--
2.27.0
- [PULL 00/13] Testing, build system and misc patches, Thomas Huth, 2021/09/02
- [PULL 02/13] libqtest: check for g_setenv() failure, Thomas Huth, 2021/09/02
- [PULL 04/13] gitlab-ci: Remove superfluous "dnf install" statement, Thomas Huth, 2021/09/02
- [PULL 03/13] gitlab-ci: Merge "build-disabled" with "build-without-default-features", Thomas Huth, 2021/09/02
- [PULL 01/13] docs: add definitions of terms for CI/testing, Thomas Huth, 2021/09/02
- [PULL 08/13] meson.build: Don't use internal libfdt if the user requested the system libfdt,
Thomas Huth <=
- [PULL 06/13] gitlab-ci: Don't try to use the system libfdt in the debian job, Thomas Huth, 2021/09/02
- [PULL 05/13] gitlab-ci: Fix ..._RUNNER_AVAILABLE variables and document them, Thomas Huth, 2021/09/02
- [PULL 07/13] meson.build: Fix the check for a usable libfdt, Thomas Huth, 2021/09/02
- [PULL 11/13] softmmu/vl: Add a "grab-mod" parameter to the -display sdl option, Thomas Huth, 2021/09/02
- [PULL 12/13] softmmu/vl: Deprecate the old grab options, Thomas Huth, 2021/09/02
- [PULL 09/13] configure / meson: Move the GBM handling to meson.build, Thomas Huth, 2021/09/02
- [PULL 13/13] softmmu/vl: Deprecate the -sdl and -curses option, Thomas Huth, 2021/09/02
- [PULL 10/13] scripts: Remove the "show-fixed-bugs.sh" file, Thomas Huth, 2021/09/02
- Re: [PULL 00/13] Testing, build system and misc patches, Peter Maydell, 2021/09/03