[pacman-dev] [PATCH] meson: fix static/shared split again

Eli Schwartz eschwartz at archlinux.org
Wed Feb 13 18:10:27 UTC 2019


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 at archlinux.org>
---
 meson.build | 4 ++--
 1 file 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],
-- 
2.20.1


More information about the pacman-dev mailing list