diff options
| author | Olivier CrĂȘte <olivier.crete@collabora.com> | 2018-11-06 11:23:45 -0500 |
|---|---|---|
| committer | Xavier Claessens <xclaesse@gmail.com> | 2018-11-06 13:09:32 -0500 |
| commit | 46d3ec2e05359af6e9766d97946538eab3c5e217 (patch) | |
| tree | e2e7168e520391908745e72e5b3f46140fd78e1d /mesonbuild/modules/gnome.py | |
| parent | a2a979cf4336e04dd05fe4ca0dcf5fa8425d474f (diff) | |
| download | meson-46d3ec2e05359af6e9766d97946538eab3c5e217.zip meson-46d3ec2e05359af6e9766d97946538eab3c5e217.tar.gz meson-46d3ec2e05359af6e9766d97946538eab3c5e217.tar.bz2 | |
gnome: Require GObject-Introspection 1.58.1 for static libraries
Introspecting non-libtool static libraries requires a gir-scanner fix
which is only in 1.58.1 or later.
Diffstat (limited to 'mesonbuild/modules/gnome.py')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index e520d22..51d4ea9 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -408,13 +408,21 @@ class GnomeModule(ExtensionModule): else: return cflags, internal_ldflags, external_ldflags, external_ldflags_nodedup, gi_includes - def _unwrap_gir_target(self, girtarget): + def _unwrap_gir_target(self, girtarget, state): while hasattr(girtarget, 'held_object'): girtarget = girtarget.held_object + if not isinstance(girtarget, (build.Executable, build.SharedLibrary, build.StaticLibrary)): raise MesonException('Gir target must be an executable or library') + STATIC_BUILD_REQUIRED_VERSION = ">=1.58.1" + if isinstance(girtarget, (build.StaticLibrary)) and \ + not mesonlib.version_compare( + self._get_gir_dep(state)[0].get_version(), + STATIC_BUILD_REQUIRED_VERSION): + raise MesonException('Static libraries can only be introspected with GObject-Introspection ' + STATIC_BUILD_REQUIRED_VERSION) + return girtarget def _get_gir_dep(self, state): @@ -739,7 +747,7 @@ class GnomeModule(ExtensionModule): giscanner = self.interpreter.find_program_impl('g-ir-scanner') gicompiler = self.interpreter.find_program_impl('g-ir-compiler') - girtargets = [self._unwrap_gir_target(arg) for arg in args] + girtargets = [self._unwrap_gir_target(arg, state) for arg in args] if len(girtargets) > 1 and any([isinstance(el, build.Executable) for el in girtargets]): raise MesonException('generate_gir only accepts a single argument when one of the arguments is an executable') |