diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-03-14 19:17:24 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2017-04-04 14:59:13 +0530 |
| commit | a4255d74f54f6d74b12f0cadcaa29a7584079503 (patch) | |
| tree | b7610c4e487781c9c40193e186b5b46c5b9d6659 | |
| parent | 98b1ce1cd9f3220ec6a06ef2bfa122518a9245ed (diff) | |
| download | meson-a4255d74f54f6d74b12f0cadcaa29a7584079503.zip meson-a4255d74f54f6d74b12f0cadcaa29a7584079503.tar.gz meson-a4255d74f54f6d74b12f0cadcaa29a7584079503.tar.bz2 | |
Don't generate import library for shared modules
Also add a test for this on all platforms.
9 files changed, 13 insertions, 0 deletions
diff --git a/mesonbuild/build.py b/mesonbuild/build.py index ef5ea5f..973d8e9 100644 --- a/mesonbuild/build.py +++ b/mesonbuild/build.py @@ -1246,6 +1246,7 @@ class SharedModule(SharedLibrary): if 'soversion' in kwargs: raise MesonException('Shared modules must not specify the soversion kwarg.') super().__init__(name, subdir, subproject, is_cross, sources, objects, environment, kwargs) + self.import_filename = None class CustomTarget(Target): known_kwargs = {'input': True, diff --git a/test cases/linuxlike/7 library versions/installed_files.txt b/test cases/linuxlike/7 library versions/installed_files.txt index b997e53..763a907 100644 --- a/test cases/linuxlike/7 library versions/installed_files.txt +++ b/test cases/linuxlike/7 library versions/installed_files.txt @@ -7,3 +7,4 @@ usr/lib/libonlyversion.so.1 usr/lib/libonlyversion.so.1.4.5 usr/lib/libonlysoversion.so usr/lib/libonlysoversion.so.5 +usr/lib/libmodule.so diff --git a/test cases/linuxlike/7 library versions/meson.build b/test cases/linuxlike/7 library versions/meson.build index 48b75ad..f162210 100644 --- a/test cases/linuxlike/7 library versions/meson.build +++ b/test cases/linuxlike/7 library versions/meson.build @@ -43,3 +43,5 @@ test('manually linked 3', executable('manuallink3', out, test('manually linked 4', executable('manuallink4', out, link_args : ['-L.', '-lonlysoversion', rpath_arg])) + +shared_module('module', 'lib.c', install : true) diff --git a/test cases/osx/2 library versions/installed_files.txt b/test cases/osx/2 library versions/installed_files.txt index fc76046..de7b078 100644 --- a/test cases/osx/2 library versions/installed_files.txt +++ b/test cases/osx/2 library versions/installed_files.txt @@ -5,3 +5,4 @@ usr/lib/libonlyversion.dylib usr/lib/libonlyversion.1.dylib usr/lib/libonlysoversion.dylib usr/lib/libonlysoversion.5.dylib +usr/lib/libmodule.dylib diff --git a/test cases/osx/2 library versions/meson.build b/test cases/osx/2 library versions/meson.build index b1962ca..9624998 100644 --- a/test cases/osx/2 library versions/meson.build +++ b/test cases/osx/2 library versions/meson.build @@ -39,3 +39,5 @@ test('manually linked 3', executable('manuallink3', out, test('manually linked 4', executable('manuallink4', out, link_args : ['-L.', '-lonlysoversion'])) + +shared_module('module', 'lib.c', install : true) diff --git a/test cases/windows/7 mingw dll versioning/installed_files.txt b/test cases/windows/7 mingw dll versioning/installed_files.txt index f02b454..56187a6 100644 --- a/test cases/windows/7 mingw dll versioning/installed_files.txt +++ b/test cases/windows/7 mingw dll versioning/installed_files.txt @@ -8,3 +8,4 @@ usr/bin/libonlysoversion-5.dll usr/lib/libonlysoversion.dll.a usr/libexec/libcustomdir.dll usr/libexec/libcustomdir.dll.a +usr/lib/libmodule.dll diff --git a/test cases/windows/7 mingw dll versioning/meson.build b/test cases/windows/7 mingw dll versioning/meson.build index 7f65532..1d6562c 100644 --- a/test cases/windows/7 mingw dll versioning/meson.build +++ b/test cases/windows/7 mingw dll versioning/meson.build @@ -51,3 +51,5 @@ test('manually linked 4', executable('manuallink4', out, shared_library('customdir', 'lib.c', install : true, install_dir : get_option('libexecdir')) + +shared_module('module', 'lib.c', install : true) diff --git a/test cases/windows/8 msvc dll versioning/installed_files.txt b/test cases/windows/8 msvc dll versioning/installed_files.txt index 1a735e2..df43343 100644 --- a/test cases/windows/8 msvc dll versioning/installed_files.txt +++ b/test cases/windows/8 msvc dll versioning/installed_files.txt @@ -10,3 +10,4 @@ usr/bin/onlysoversion-5.dll usr/lib/onlysoversion.lib usr/libexec/customdir.dll usr/libexec/customdir.lib +usr/lib/module.dll diff --git a/test cases/windows/8 msvc dll versioning/meson.build b/test cases/windows/8 msvc dll versioning/meson.build index eea41d9..4074747 100644 --- a/test cases/windows/8 msvc dll versioning/meson.build +++ b/test cases/windows/8 msvc dll versioning/meson.build @@ -52,3 +52,5 @@ test('manually linked 4', executable('manuallink4', out, shared_library('customdir', 'lib.c', install : true, install_dir : get_option('libexecdir')) + +shared_module('module', 'lib.c', install : true) |