diff options
| author | Matthias Klumpp <matthias@tenstral.net> | 2018-03-29 01:41:01 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2018-03-29 20:28:33 +0300 |
| commit | 6146353f454a6db709309ad47798df87462097c9 (patch) | |
| tree | 0b0fd5b81d78f004fc5e38243b2b35eea0a051c9 | |
| parent | b4aee4675afd9f9f4a36aea628bab4249d7addbc (diff) | |
| download | meson-6146353f454a6db709309ad47798df87462097c9.zip meson-6146353f454a6db709309ad47798df87462097c9.tar.gz meson-6146353f454a6db709309ad47798df87462097c9.tar.bz2 | |
Don't crash when using d_module_versions for pkg-config
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 2 | ||||
| -rw-r--r-- | test cases/d/3 shared library/meson.build | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index e055616..ef74d63 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -349,7 +349,7 @@ class PkgConfigModule(ExtensionModule): if dversions: compiler = state.environment.coredata.compilers.get('d') if compiler: - deps.add_cflags(compiler.get_feature_args({'versions': dversions})) + deps.add_cflags(compiler.get_feature_args({'versions': dversions}, None)) def parse_variable_list(stringlist): reserved = ['prefix', 'libdir', 'includedir'] diff --git a/test cases/d/3 shared library/meson.build b/test cases/d/3 shared library/meson.build index 78ad766..4616242 100644 --- a/test cases/d/3 shared library/meson.build +++ b/test cases/d/3 shared library/meson.build @@ -10,3 +10,12 @@ endif ldyn = shared_library('stuff', 'libstuff.d', install : true) ed = executable('app_d', 'app.d', link_with : ldyn, install : true) test('linktest_dyn', ed) + +# test D attributes for pkg-config +pkgc = import('pkgconfig') +pkgc.generate(name: 'test', + libraries: ldyn, + subdirs: 'd/stuff', + description: 'A test of D attributes to pkgconfig.generate.', + d_module_versions: ['Use_Static'] +) |