[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH] meson.build: Don't look for libudev for static builds
From: |
Peter Maydell |
Subject: |
[PATCH] meson.build: Don't look for libudev for static builds |
Date: |
Fri, 2 Oct 2020 11:52:39 +0100 |
commit f01496a314d916 moved the logic for detecting libudev from
configure to meson.build, but in the process it dropped the condition
that meant we only ask pkg-config about libudev for a non-static
build.
This breaks static builds of the system emulators on at least Ubuntu
18.04.4, because on that host there is no static libudev but
pkg-config still claims it exists.
Reinstate the logic that we had in the configure check.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
We could certainly do something cleverer here, but basic "convert
from configure to meson" should in general not also be changing the
detection logic IMHO. We can make the logic smarter as a follow-on
patch if desired.
---
meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/meson.build b/meson.build
index 3161c1f037a..07da66e1d81 100644
--- a/meson.build
+++ b/meson.build
@@ -271,7 +271,7 @@ if 'CONFIG_CURL' in config_host
link_args: config_host['CURL_LIBS'].split())
endif
libudev = not_found
-if targetos == 'linux' and (have_system or have_tools)
+if targetos == 'linux' and (have_system or have_tools) and not enable_static
libudev = dependency('libudev',
required: get_option('mpath').enabled(),
static: enable_static)
--
2.20.1
- [PATCH] meson.build: Don't look for libudev for static builds,
Peter Maydell <=
- Re: [PATCH] meson.build: Don't look for libudev for static builds, Yonggang Luo, 2020/10/02
- Re: [PATCH] meson.build: Don't look for libudev for static builds, Paolo Bonzini, 2020/10/02
- Re: [PATCH] meson.build: Don't look for libudev for static builds, Paolo Bonzini, 2020/10/02
- Re: [PATCH] meson.build: Don't look for libudev for static builds, Peter Maydell, 2020/10/02
- Re: [PATCH] meson.build: Don't look for libudev for static builds, Paolo Bonzini, 2020/10/02