diff options
| author | Rico Tzschichholz <ricotz@ubuntu.com> | 2017-10-05 15:03:18 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2017-10-08 14:04:34 +0300 |
| commit | 8b8e1ee620ad170fc32fbabc362827ed53332186 (patch) | |
| tree | 03d2384b558a6b7c43a6588493255e619145d4a4 | |
| parent | 68bd64cd38f40eedddbe8e96ea6a61c746d1b78b (diff) | |
| download | meson-8b8e1ee620ad170fc32fbabc362827ed53332186.tar.gz | |
gnome: g-ir-scanner accepts multiple symbol-prefix arguments
| -rw-r--r-- | docs/markdown/Gnome-module.md | 3 | ||||
| -rw-r--r-- | mesonbuild/modules/gnome.py | 6 |
2 files changed, 4 insertions, 5 deletions
diff --git a/docs/markdown/Gnome-module.md b/docs/markdown/Gnome-module.md index 9697b7fb3..738e2a955 100644 --- a/docs/markdown/Gnome-module.md +++ b/docs/markdown/Gnome-module.md @@ -72,7 +72,8 @@ tool so see its documentation for more information. * `install_dir_typelib`: (*Added 0.35.0*) which directory to install the typelib file into * `link_with`: list of libraries to link with -* `symbol_prefix`: the symbol prefix for the gir object, e.g. `gtk` +* `symbol_prefix`: the symbol prefix for the gir object, e.g. `gtk`, + (*Since 0.43.0*) an ordered list of multiple prefixes is allowed Returns an array of two elements which are: `[gir_target, typelib_target]` diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 1f813da92..a754b3260 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -511,10 +511,8 @@ class GnomeModule(ExtensionModule): # does not understand -f LDFLAGS. https://bugzilla.gnome.org/show_bug.cgi?id=783892 # ldflags += compilers.sanitizer_link_args(sanitize) if 'symbol_prefix' in kwargs: - sym_prefix = kwargs.pop('symbol_prefix') - if not isinstance(sym_prefix, str): - raise MesonException('Gir symbol prefix must be str') - scan_command += ['--symbol-prefix=%s' % sym_prefix] + sym_prefixes = mesonlib.stringlistify(kwargs.pop('symbol_prefix', [])) + scan_command += ['--symbol-prefix=%s' % sym_prefix for sym_prefix in sym_prefixes] if 'identifier_prefix' in kwargs: identifier_prefix = kwargs.pop('identifier_prefix') if not isinstance(identifier_prefix, str): |