From 9da0c6af9884371b7e685d8ff5af1c9c2f4208c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olivier=20Cr=C3=AAte?= Date: Mon, 5 Nov 2018 14:54:29 -0500 Subject: gnome: GIR works fine for static libraries g-ir-scanner works as well with static libraries as with dynamic --- mesonbuild/modules/gnome.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 46df53e..ae86146 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -411,8 +411,10 @@ class GnomeModule(ExtensionModule): def _unwrap_gir_target(self, girtarget): while hasattr(girtarget, 'held_object'): girtarget = girtarget.held_object - if not isinstance(girtarget, (build.Executable, build.SharedLibrary)): - raise MesonException('Gir target must be an executable or shared library') + if not isinstance(girtarget, (build.Executable, build.SharedLibrary, + build.StaticLibrary)): + raise MesonException('Gir target must be an executable or library') + return girtarget def _get_gir_dep(self, state): @@ -537,7 +539,7 @@ class GnomeModule(ExtensionModule): for girtarget in girtargets: if isinstance(girtarget, build.Executable): ret += ['--program', girtarget] - elif isinstance(girtarget, build.SharedLibrary): + else: libname = girtarget.get_basename() # Needed for the following binutils bug: # https://github.com/mesonbuild/meson/issues/1911 -- cgit v1.1