From 1c4da332ee6e0d948f85a63f74cb27e89075c011 Mon Sep 17 00:00:00 2001 From: Aleksander Morgado Date: Thu, 8 Dec 2022 14:37:56 +0000 Subject: build: new option to build plugins within the daemon binary Instead of creating libmm-plugin* and libmm-shared* libraries that are dlopen()-ed on runtime, allow incorporating all plugins into the daemon binary itself. This makes the startup of the daemon much faster and also avoids issues with builds that require linker namespace isolation. Fixes https://gitlab.freedesktop.org/mobile-broadband/ModemManager/-/issues/674 --- data/tests/meson.build | 7 ++++++- data/tests/org.freedesktop.ModemManager1.service.in | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/tests/meson.build b/data/tests/meson.build index 1cc0826b..3b3ee790 100644 --- a/data/tests/meson.build +++ b/data/tests/meson.build @@ -1,9 +1,14 @@ # SPDX-License-Identifier: GPL-2.0-or-later # Copyright (C) 2022 Aleksander Morgado +test_plugin_dir = '' +if not enable_builtin_plugins + test_plugin_dir = '--test-plugin-dir="' + build_root + '/src/plugins"' +endif + test_conf = { 'abs_top_builddir': build_root, - 'PLUGIN_BUILD_SUBDIR': 'src/plugins/', + 'test_plugin_dir': test_plugin_dir, } configure_file( diff --git a/data/tests/org.freedesktop.ModemManager1.service.in b/data/tests/org.freedesktop.ModemManager1.service.in index d8a751b4..15fe3c7b 100644 --- a/data/tests/org.freedesktop.ModemManager1.service.in +++ b/data/tests/org.freedesktop.ModemManager1.service.in @@ -2,4 +2,4 @@ [D-BUS Service] Name=org.freedesktop.ModemManager1 -Exec=@abs_top_builddir@/src/ModemManager --test-session --no-auto-scan --test-enable --test-plugin-dir="@abs_top_builddir@/@PLUGIN_BUILD_SUBDIR@" --debug +Exec=@abs_top_builddir@/src/ModemManager --test-session --no-auto-scan --test-enable @test_plugin_dir@ --debug -- cgit v1.2.3-70-g09d2