[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 06/24] meson: clean up static_library keyword arguments
From: |
Paolo Bonzini |
Subject: |
[PULL 06/24] meson: clean up static_library keyword arguments |
Date: |
Tue, 3 Oct 2023 10:30:23 +0200 |
These are either built because they are dependencies of other targets,
or not needed at all because they are used via extract_objects().
Mark them as "build_by_default: false"; if applicable, mark them
as "fa" so that -Wl,--whole-archive does not interact with the
linker script used for fuzzing.
(The "fa" hack is brittle; updating to Meson 1.1 would allow using
declare_dependency(objects: ...) instead).
Resolves: https://gitlab.com/qemu-project/qemu/-/issues/1044
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
gdbstub/meson.build | 4 ++--
meson.build | 11 +++++++----
tcg/meson.build | 4 ++--
3 files changed, 11 insertions(+), 8 deletions(-)
diff --git a/gdbstub/meson.build b/gdbstub/meson.build
index 9500b9dc4e6..a5a1f4e433f 100644
--- a/gdbstub/meson.build
+++ b/gdbstub/meson.build
@@ -21,12 +21,12 @@ libgdb_user = static_library('gdb_user',
gdb_user_ss.sources() + genh,
name_suffix: 'fa',
c_args: '-DCONFIG_USER_ONLY',
- build_by_default: have_user)
+ build_by_default: false)
libgdb_softmmu = static_library('gdb_softmmu',
gdb_system_ss.sources() + genh,
name_suffix: 'fa',
- build_by_default: have_system)
+ build_by_default: false)
gdb_user = declare_dependency(link_whole: libgdb_user)
user_ss.add(gdb_user)
diff --git a/meson.build b/meson.build
index 81430ce2348..21a1bc03f87 100644
--- a/meson.build
+++ b/meson.build
@@ -3180,7 +3180,6 @@ foreach d : hx_headers
input: files(d[0]),
output: d[1],
capture: true,
- build_by_default: true, # to be removed when added to a target
command: [hxtool, '-h', '@INPUT0@'])
endforeach
genh += hxdep
@@ -3366,12 +3365,15 @@ endif
qom_ss = qom_ss.apply(config_targetos, strict: false)
libqom = static_library('qom', qom_ss.sources() + genh,
dependencies: [qom_ss.dependencies()],
- name_suffix: 'fa')
+ name_suffix: 'fa',
+ build_by_default: false)
qom = declare_dependency(link_whole: libqom)
event_loop_base = files('event-loop-base.c')
-event_loop_base = static_library('event-loop-base', sources: event_loop_base +
genh,
- build_by_default: true)
+event_loop_base = static_library('event-loop-base',
+ sources: event_loop_base + genh,
+ name_suffix: 'fa',
+ build_by_default: false)
event_loop_base = declare_dependency(link_whole: event_loop_base,
dependencies: [qom])
@@ -3380,6 +3382,7 @@ stub_ss = stub_ss.apply(config_all, strict: false)
util_ss.add_all(trace_ss)
util_ss = util_ss.apply(config_all, strict: false)
libqemuutil = static_library('qemuutil',
+ build_by_default: false,
sources: util_ss.sources() + stub_ss.sources() +
genh,
dependencies: [util_ss.dependencies(), libm,
threads, glib, socket, malloc, pixman])
qemuutil = declare_dependency(link_with: libqemuutil,
diff --git a/tcg/meson.build b/tcg/meson.build
index 0014dca7d4f..4be4a616caa 100644
--- a/tcg/meson.build
+++ b/tcg/meson.build
@@ -28,7 +28,7 @@ libtcg_user = static_library('tcg_user',
tcg_ss.sources() + genh,
name_suffix: 'fa',
c_args: '-DCONFIG_USER_ONLY',
- build_by_default: have_user)
+ build_by_default: false)
tcg_user = declare_dependency(link_with: libtcg_user,
dependencies: tcg_ss.dependencies())
@@ -38,7 +38,7 @@ libtcg_softmmu = static_library('tcg_softmmu',
tcg_ss.sources() + genh,
name_suffix: 'fa',
c_args: '-DCONFIG_SOFTMMU',
- build_by_default: have_system)
+ build_by_default: false)
tcg_softmmu = declare_dependency(link_with: libtcg_softmmu,
dependencies: tcg_ss.dependencies())
--
2.41.0
- [PULL 00/24] Audio, build system, misc fixes for 2023-10-03, Paolo Bonzini, 2023/10/03
- [PULL 01/24] optionrom: Remove build-id section, Paolo Bonzini, 2023/10/03
- [PULL 06/24] meson: clean up static_library keyword arguments,
Paolo Bonzini <=
- [PULL 02/24] accel/kvm/kvm-all: Handle register access errors, Paolo Bonzini, 2023/10/03
- [PULL 03/24] e1000: remove old compatibility code, Paolo Bonzini, 2023/10/03
- [PULL 07/24] Makefile: build plugins before running TCG tests, Paolo Bonzini, 2023/10/03
- [PULL 11/24] crypto: only include tls-cipher-suites in emulators, Paolo Bonzini, 2023/10/03
- [PULL 12/24] ui/vnc: Require audiodev= to enable audio, Paolo Bonzini, 2023/10/03
- [PULL 05/24] make-release: do not ship dtc sources, Paolo Bonzini, 2023/10/03
- [PULL 10/24] scsi-disk: ensure that FORMAT UNIT commands are terminated, Paolo Bonzini, 2023/10/03
- [PULL 21/24] hw/ppc: Support machine-default audiodev with fallback, Paolo Bonzini, 2023/10/03
- [PULL 08/24] esp: use correct type for esp_dma_enable() in sysbus_esp_gpio_demux(), Paolo Bonzini, 2023/10/03
- [PULL 15/24] audio: return Error ** from audio_state_by_name, Paolo Bonzini, 2023/10/03