diff options
| author | Iñigo Martínez <inigomartinez@gmail.com> | 2021-08-04 12:24:58 +0200 |
|---|---|---|
| committer | Iñigo Martínez <inigomartinez@gmail.com> | 2021-08-04 12:24:58 +0200 |
| commit | 648b05dec274608c915630e38ebde89c65b56dea (patch) | |
| tree | b0eb0f10331e65445d15dd53e6231ca94b97b240 /src | |
| parent | cf55b1808a2c242acd24620f459ca12d64d99fa6 (diff) | |
build,meson: Fix missing symbols
The whole `libqmi-glib-generated` is set to be linked when building
`libqmi-glib-compat`. Then the whole `libqmi-glib-compat` is also
set to be linked when building `libqmi-glib`. This is:
`libqmi-glib-generated` -> `libqmi-glib-compat` -> `libqmi-glib`
However, the symbols of `libqmi-glib-generated` are not included in
`libqmi-glib`. This is because meson doesn't generate the proper
chain when building different static libraries.
This is issue is also open in meson[0] but it is fixed in recent
meson versions.
To also include the symbols from `libqmi-glib-generated` in the
current meson version used in `libqmi`, it is now set to be linked
in `libqmi-glib`.
[0] https://github.com/mesonbuild/meson/issues/5343
Diffstat (limited to 'src')
| -rw-r--r-- | src/libqmi-glib/meson.build | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/libqmi-glib/meson.build b/src/libqmi-glib/meson.build index b6de003..d13e68f 100644 --- a/src/libqmi-glib/meson.build +++ b/src/libqmi-glib/meson.build @@ -70,7 +70,6 @@ libqmi_glib_compat = static_library( include_directories: top_inc, dependencies: generated_dep, c_args: common_c_flags + no_deprecated_declarations_flags, - link_whole: libqmi_glib_generated, ) libname = 'qmi-glib' @@ -118,7 +117,7 @@ libqmi_glib = library( include_directories: top_inc, dependencies: deps, c_args: common_c_flags + ['-DLIBEXEC_PATH="@0@"'.format(join_paths(qmi_prefix, qmi_libexecdir))], - link_whole: libqmi_glib_compat, + link_whole: [libqmi_glib_compat, libqmi_glib_generated], install: true, ) |