diff options
| author | Eli Schwartz <eschwartz@archlinux.org> | 2019-02-13 13:10:27 -0500 |
|---|---|---|
| committer | Allan McRae <allan@archlinux.org> | 2019-02-21 14:34:02 +1000 |
| commit | ba7a41031c201b20d26cb69aa8b25acfb55c56bd (patch) | |
| tree | 86b485b3cb1dfbf831273414bcc65115f3530577 | |
| parent | 3c774252ef11fd71270895bbbe892c81093aac77 (diff) | |
| download | pacman-ba7a41031c201b20d26cb69aa8b25acfb55c56bd.tar.xz | |
meson: fix static/shared split again
shared_library does not generate a sane pkg-config file because it
assumes we don't want dependencies.
Additionally, since we key off of buildstatic, when *not* using
buildstatic but attempting to build libalpm on its own as static using
-Ddefault_library=static, we are building and linking to a shared
libalpm anyway.
Signed-off-by: Eli Schwartz <eschwartz@archlinux.org>
Signed-off-by: Allan McRae <allan@archlinux.org>
| -rw-r--r-- | meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/meson.build b/meson.build index 8e9dbd71..0f706c64 100644 --- a/meson.build +++ b/meson.build @@ -363,8 +363,8 @@ libalpm_a = static_library( link_with : [libcommon], install : true) -if not get_option('buildstatic') - libalpm = shared_library( +if get_option('default_library') != 'static' + libalpm = library( 'alpm', version : libalpm_version, link_whole: [libalpm_a], |