gnome.gtkdoc: Fix static library ldflags

When passing static libraries to gtkdoc, they are also appended as
shared libraries to ldflags, which makes the process to fail.

This has been changed to only append shared libraries to ldflags.

Fixes #3935
pull/4287/head
Iñigo Martínez 6 years ago committed by Jussi Pakkanen
parent 26a5e9a95f
commit ee80620f65
  1. 17
      mesonbuild/modules/gnome.py

@ -331,14 +331,15 @@ class GnomeModule(ExtensionModule):
for lib in dep.libraries: for lib in dep.libraries:
if hasattr(lib, 'held_object'): if hasattr(lib, 'held_object'):
lib = lib.held_object lib = lib.held_object
internal_ldflags.update(self._get_link_args(state, lib, depends, include_rpath)) if isinstance(lib, build.SharedLibrary):
libdepflags = self._get_dependencies_flags(lib.get_external_deps(), state, depends, include_rpath, internal_ldflags.update(self._get_link_args(state, lib, depends, include_rpath))
use_gir_args, True) libdepflags = self._get_dependencies_flags(lib.get_external_deps(), state, depends, include_rpath,
cflags.update(libdepflags[0]) use_gir_args, True)
internal_ldflags.update(libdepflags[1]) cflags.update(libdepflags[0])
external_ldflags.update(libdepflags[2]) internal_ldflags.update(libdepflags[1])
external_ldflags_nodedup += libdepflags[3] external_ldflags.update(libdepflags[2])
gi_includes.update(libdepflags[4]) external_ldflags_nodedup += libdepflags[3]
gi_includes.update(libdepflags[4])
extdepflags = self._get_dependencies_flags(dep.ext_deps, state, depends, include_rpath, extdepflags = self._get_dependencies_flags(dep.ext_deps, state, depends, include_rpath,
use_gir_args, True) use_gir_args, True)
cflags.update(extdepflags[0]) cflags.update(extdepflags[0])

Loading…
Cancel
Save