[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 02/22] meson: Add missing libdw knobs
From: |
Thomas Huth |
Subject: |
[PULL 02/22] meson: Add missing libdw knobs |
Date: |
Tue, 14 Feb 2023 12:21:28 +0100 |
From: Ilya Leoshkevich <iii@linux.ibm.com>
Add the missing meson infrastructure bits for the new libdw
dependency. Model them after the existing capstone knobs.
Fixes: 7c10cb38ccb8 ("accel/tcg: Add debuginfo support")
Reported-by: Thomas Huth <thuth@redhat.com>
Signed-off-by: Ilya Leoshkevich <iii@linux.ibm.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20230210005208.438142-1-iii@linux.ibm.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
meson.build | 11 +++++++----
meson_options.txt | 2 ++
scripts/meson-buildoptions.sh | 3 +++
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/meson.build b/meson.build
index c626ccfa82..50eb670511 100644
--- a/meson.build
+++ b/meson.build
@@ -1649,10 +1649,13 @@ if libbpf.found() and not cc.links('''
endif
# libdw
-libdw = dependency('libdw',
- method: 'pkg-config',
- kwargs: static_kwargs,
- required: false)
+libdw = not_found
+if not get_option('libdw').auto() or have_system or have_user
+ libdw = dependency('libdw',
+ method: 'pkg-config',
+ kwargs: static_kwargs,
+ required: get_option('libdw'))
+endif
#################
# config-host.h #
diff --git a/meson_options.txt b/meson_options.txt
index e5f199119e..56415c5c23 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -131,6 +131,8 @@ option('gio', type : 'feature', value : 'auto',
description: 'use libgio for D-Bus support')
option('glusterfs', type : 'feature', value : 'auto',
description: 'Glusterfs block device driver')
+option('libdw', type : 'feature', value : 'auto',
+ description: 'debuginfo support')
option('libiscsi', type : 'feature', value : 'auto',
description: 'libiscsi userspace initiator')
option('libnfs', type : 'feature', value : 'auto',
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index c2982ea087..180c11665a 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -109,6 +109,7 @@ meson_options_help() {
printf "%s\n" ' kvm KVM acceleration support'
printf "%s\n" ' l2tpv3 l2tpv3 network backend support'
printf "%s\n" ' libdaxctl libdaxctl support'
+ printf "%s\n" ' libdw debuginfo support'
printf "%s\n" ' libiscsi libiscsi userspace initiator'
printf "%s\n" ' libnfs libnfs block device driver'
printf "%s\n" ' libpmem libpmem support'
@@ -312,6 +313,8 @@ _meson_option_parse() {
--enable-libdaxctl) printf "%s" -Dlibdaxctl=enabled ;;
--disable-libdaxctl) printf "%s" -Dlibdaxctl=disabled ;;
--libdir=*) quote_sh "-Dlibdir=$2" ;;
+ --enable-libdw) printf "%s" -Dlibdw=enabled ;;
+ --disable-libdw) printf "%s" -Dlibdw=disabled ;;
--libexecdir=*) quote_sh "-Dlibexecdir=$2" ;;
--enable-libiscsi) printf "%s" -Dlibiscsi=enabled ;;
--disable-libiscsi) printf "%s" -Dlibiscsi=disabled ;;
--
2.31.1
- [PULL 00/22] qtest, s390x and misc patches, Thomas Huth, 2023/02/14
- [PULL 01/22] configure: Bump minimum Clang version to 10.0, Thomas Huth, 2023/02/14
- [PULL 03/22] meson: Disable libdw for static builds by default, Thomas Huth, 2023/02/14
- [PULL 02/22] meson: Add missing libdw knobs,
Thomas Huth <=
- [PULL 04/22] build: deprecate --enable-gprof builds and remove from CI, Thomas Huth, 2023/02/14
- [PULL 05/22] tests/qtest/npcm7xx_pwm-test: Be less verbose unless V=2, Thomas Huth, 2023/02/14
- [PULL 06/22] hw/misc/sga: Remove the deprecated "sga" device, Thomas Huth, 2023/02/14
- [PULL 09/22] tests/qtest: Skip PXE tests for missing devices, Thomas Huth, 2023/02/14
- [PULL 07/22] include/hw: Do not include "hw/registerfields.h" in headers that don't need it, Thomas Huth, 2023/02/14
- [PULL 08/22] Do not include "qemu/error-report.h" in headers that do not need it, Thomas Huth, 2023/02/14
- [PULL 10/22] tests/qtest: Do not run lsi53c895a test if device is not present, Thomas Huth, 2023/02/14
- [PULL 12/22] tests/qtest: hd-geo-test: Check for missing devices, Thomas Huth, 2023/02/14
- [PULL 11/22] tests/qtest: Add dependence on PCIE_PORT for virtio-net-failover.c, Thomas Huth, 2023/02/14
- [PULL 14/22] tests/qtest: Skip unplug tests that use missing devices, Thomas Huth, 2023/02/14