diff options
| author | Aleksander Morgado <aleksandermj@chromium.org> | 2022-12-08 14:37:56 +0000 |
|---|---|---|
| committer | Aleksander Morgado <aleksander@aleksander.es> | 2023-01-03 13:56:25 +0000 |
| commit | 1c4da332ee6e0d948f85a63f74cb27e89075c011 (patch) | |
| tree | 03a01bf796b4d435cd233c89ed3d05c562ed3fd1 /data | |
| parent | 1dd70be4c834ba025ff16b343aa4032a8c64fb71 (diff) | |
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
Diffstat (limited to 'data')
| -rw-r--r-- | data/tests/meson.build | 7 | ||||
| -rw-r--r-- | data/tests/org.freedesktop.ModemManager1.service.in | 2 |
2 files changed, 7 insertions, 2 deletions
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 <aleksander@aleksander.es> +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 |