SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #33599 from keszybz/link-executor-statically

Browse Source 
Link executor statically
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2024-07-08 12:46:41 +02:00
committed by GitHub
parent c214c4a8a7 d59cae6ceb
commit c80c5c20d4
11 changed files with 38 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/meson.build
+23 -9
View File
@@ -110,17 +110,13 @@ load_fragment_gperf_nulstr_c = custom_target(
libcore_name = 'systemd-core-@0@'.format(shared_lib_tag)
libcore = shared_library(
libcore_static = static_library(
libcore_name,
libcore_sources,
load_fragment_gperf_c,
load_fragment_gperf_nulstr_c,
include_directories : includes,
c_args : ['-fvisibility=default'],
link_args : ['-shared',
'-Wl,--version-script=' + libshared_sym_path],
link_depends : libshared_sym_path,
link_with : libshared,
dependencies : [libacl,
libapparmor,
libaudit,
@@ -135,6 +131,16 @@ libcore = shared_library(
libselinux,
threads,
userspace],
build_by_default : false)
libcore = shared_library(
libcore_name,
c_args : ['-fvisibility=default'],
link_args : ['-shared',
'-Wl,--version-script=' + libshared_sym_path],
link_depends : libshared_sym_path,
link_whole: libcore_static,
link_with : libshared,
install : true,
install_dir : pkglibdir)
@@ -151,6 +157,17 @@ systemd_executor_sources = files(
'exec-invoke.c',
)
executor_libs = get_option('link-executor-shared') ? \
[
libcore,
libshared,
] : [
libcore_static,
libshared_static,
libbasic_static,
libsystemd_static,
]
executables += [
libexec_template + {
'name' : 'systemd',
@@ -168,10 +185,7 @@ executables += [
'public' : true,
'sources' : systemd_executor_sources,
'include_directories' : core_includes,
'link_with' : [
libcore,
libshared,
],
'link_with' : executor_libs,
'dependencies' : [
libapparmor,
libpam,