From: Marc-André Lureau <marcandre.lur...@redhat.com> The .fa suffix was a temporary hack introduced in commit 1f0a1d8a51 ("build-sys hack: link with whole .fa archives") when the build system was mixed between meson & makefiles. It is no longer needed.
Signed-off-by: Marc-André Lureau <marcandre.lur...@redhat.com> --- docs/devel/build-system.rst | 5 ----- meson.build | 18 +++--------------- tests/qtest/libqos/meson.build | 1 - 3 files changed, 3 insertions(+), 21 deletions(-) diff --git a/docs/devel/build-system.rst b/docs/devel/build-system.rst index 431caba7aa06..75c30b819799 100644 --- a/docs/devel/build-system.rst +++ b/docs/devel/build-system.rst @@ -154,15 +154,10 @@ Subsystem sourcesets: are then turned into static libraries as follows:: libchardev = static_library('chardev', chardev_ss.sources(), - name_suffix: 'fa', build_by_default: false) chardev = declare_dependency(link_whole: libchardev) - As of Meson 0.55.1, the special ``.fa`` suffix should be used for everything - that is used with ``link_whole``, to ensure that the link flags are placed - correctly in the command line. - Target-independent emulator sourcesets: Various general purpose helper code is compiled only once and the .o files are linked into all output binaries that need it. diff --git a/meson.build b/meson.build index 101a3f2d31ee..40abe86767e8 100644 --- a/meson.build +++ b/meson.build @@ -2940,15 +2940,13 @@ qemu_syms = custom_target('qemu.syms', output: 'qemu.syms', qom_ss = qom_ss.apply(config_host, strict: false) libqom = static_library('qom', qom_ss.sources() + genh, - dependencies: [qom_ss.dependencies()], - name_suffix: 'fa') + dependencies: [qom_ss.dependencies()]) qom = declare_dependency(link_whole: libqom) authz_ss = authz_ss.apply(config_host, strict: false) libauthz = static_library('authz', authz_ss.sources() + genh, dependencies: [authz_ss.dependencies()], - name_suffix: 'fa', build_by_default: false) authz = declare_dependency(link_whole: libauthz, @@ -2957,7 +2955,6 @@ authz = declare_dependency(link_whole: libauthz, crypto_ss = crypto_ss.apply(config_host, strict: false) libcrypto = static_library('crypto', crypto_ss.sources() + genh, dependencies: [crypto_ss.dependencies()], - name_suffix: 'fa', build_by_default: false) crypto = declare_dependency(link_whole: libcrypto, @@ -2967,13 +2964,11 @@ io_ss = io_ss.apply(config_host, strict: false) libio = static_library('io', io_ss.sources() + genh, dependencies: [io_ss.dependencies()], link_with: libqemuutil, - name_suffix: 'fa', build_by_default: false) io = declare_dependency(link_whole: libio, dependencies: [crypto, qom]) libmigration = static_library('migration', sources: migration_files + genh, - name_suffix: 'fa', build_by_default: false) migration = declare_dependency(link_with: libmigration, dependencies: [zlib, qom, io]) @@ -2983,7 +2978,6 @@ block_ss = block_ss.apply(config_host, strict: false) libblock = static_library('block', block_ss.sources() + genh, dependencies: block_ss.dependencies(), link_depends: block_syms, - name_suffix: 'fa', build_by_default: false) block = declare_dependency(link_whole: [libblock], @@ -2993,7 +2987,6 @@ block = declare_dependency(link_whole: [libblock], blockdev_ss = blockdev_ss.apply(config_host, strict: false) libblockdev = static_library('blockdev', blockdev_ss.sources() + genh, dependencies: blockdev_ss.dependencies(), - name_suffix: 'fa', build_by_default: false) blockdev = declare_dependency(link_whole: [libblockdev], @@ -3002,13 +2995,11 @@ blockdev = declare_dependency(link_whole: [libblockdev], qmp_ss = qmp_ss.apply(config_host, strict: false) libqmp = static_library('qmp', qmp_ss.sources() + genh, dependencies: qmp_ss.dependencies(), - name_suffix: 'fa', build_by_default: false) qmp = declare_dependency(link_whole: [libqmp]) libchardev = static_library('chardev', chardev_ss.sources() + genh, - name_suffix: 'fa', dependencies: [gnutls], build_by_default: false) @@ -3016,7 +3007,6 @@ chardev = declare_dependency(link_whole: libchardev) hwcore_ss = hwcore_ss.apply(config_host, strict: false) libhwcore = static_library('hwcore', sources: hwcore_ss.sources() + genh, - name_suffix: 'fa', build_by_default: false) hwcore = declare_dependency(link_whole: libhwcore) common_ss.add(hwcore) @@ -3047,8 +3037,7 @@ common_all = static_library('common', sources: common_all.sources() + genh, include_directories: common_user_inc, implicit_include_directories: false, - dependencies: common_all.dependencies(), - name_suffix: 'fa') + dependencies: common_all.dependencies()) feature_to_c = find_program('scripts/feature_to_c.sh') @@ -3145,8 +3134,7 @@ foreach target : target_dirs objects: objects, include_directories: target_inc, c_args: c_args, - build_by_default: false, - name_suffix: 'fa') + build_by_default: false) if target.endswith('-softmmu') execs = [{ diff --git a/tests/qtest/libqos/meson.build b/tests/qtest/libqos/meson.build index e988d1579172..c175c57768cd 100644 --- a/tests/qtest/libqos/meson.build +++ b/tests/qtest/libqos/meson.build @@ -57,7 +57,6 @@ libqos_srcs = files('../libqtest.c', ) libqos = static_library('qos', libqos_srcs + genh, - name_suffix: 'fa', build_by_default: false) qos = declare_dependency(link_whole: libqos) -- 2.35.1.273.ge6ebfd0e8cbb