From a8e559d4c66d0286061328a0ad5cbfed9080d29c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Tue, 19 Dec 2017 19:14:03 +0100 Subject: [PATCH] meson: link libsystemd_static in libshared instead of recompiling This is similar to the great-grandpa commit. This time the number of meson targets compilation without man is reduced from 1347 to 1302. --- src/libsystemd/meson.build | 3 ++- src/shared/meson.build | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build index b305af159c..9eb5a917cf 100644 --- a/src/libsystemd/meson.build +++ b/src/libsystemd/meson.build @@ -100,7 +100,8 @@ libsystemd_static = static_library( include_directories : includes, link_with : libbasic, dependencies : [threads, - librt]) + librt], + c_args : ['-fvisibility=default']) libsystemd_sym = 'src/libsystemd/libsystemd.sym' diff --git a/src/shared/meson.build b/src/shared/meson.build index 7402e75592..5fa863acef 100644 --- a/src/shared/meson.build +++ b/src/shared/meson.build @@ -167,14 +167,14 @@ libshared_static = static_library( libshared = shared_library( libshared_name, journal_internal_sources, - libsystemd_sources, libudev_sources, include_directories : includes, link_args : ['-shared', '-Wl,--version-script=' + libshared_sym_path], link_whole : [libshared_static, libbasic, - libbasic_gcrypt], + libbasic_gcrypt, + libsystemd_static], c_args : ['-fvisibility=default'], dependencies : libshared_deps, install : true,