shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-12-22 17:35:35 +03:00
Code

meson: rename libbasic to libbasic_static

Browse Source 
Our variables for internal libraries are named 'libfoo' for the shared lib
variant, and 'libfoo_static' for the static lib variant. The only exception was
libbasic, because we didn't have a shared variant for it. But let's rename it
for consitency. This makes the build config easier to understand.

(cherry picked from commit 732ed8a84e)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2024-07-03 16:51:05 +02:00
parent fcbafc3ffe
commit 9be2fe707e
9 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
meson.build
View File

@ -2089,7 +2089,7 @@ libsystemd = shared_library(
# Make sure our library is never deleted from memory, so that our open logging fds don't leak on dlopen/dlclose cycles.
'-z', 'nodelete',
'-Wl,--version-script=' + libsystemd_sym_path],
link_with : [libbasic],
link_with : [libbasic_static],
link_whole : [libsystemd_static],
dependencies : [librt,
threads,
@ -2254,7 +2254,7 @@ nss_template = {
'link_with' : [
libsystemd_static,
libshared_static,
libbasic,
libbasic_static,
],
'dependencies' : [
librt,

2
src/basic/meson.build
View File

@ -274,7 +274,7 @@ filesystem_switch_case_h = custom_target(
basic_sources += [filesystem_list_h, filesystem_switch_case_h, filesystems_gperf_h]
libbasic = static_library(
libbasic_static = static_library(
'basic',
basic_sources,
fundamental_sources,

2
src/libsystemd/meson.build
View File

@ -118,7 +118,7 @@ libsystemd_static = static_library(
libsystemd_sources,
include_directories : libsystemd_includes,
c_args : libsystemd_c_args,
link_with : [libbasic],
link_with : [libbasic_static],
dependencies : [threads,
librt,
userspace],

2
src/partition/meson.build
View File

@ -32,7 +32,7 @@ executables += [
'sources' : files('repart.c'),
'c_args' : '-DSTANDALONE',
'link_with' : [
libbasic,
libbasic_static,
libshared_fdisk,
libshared_static,
libsystemd_static,

2
src/shared/meson.build
View File

@ -358,7 +358,7 @@ libshared = shared_library(
'-Wl,--version-script=' + libshared_sym_path],
link_depends : libshared_sym_path,
link_whole : [libshared_static,
libbasic,
libbasic_static,
libsystemd_static],
dependencies : [libshared_deps,
userspace],

2
src/shutdown/meson.build
View File

@ -20,7 +20,7 @@ executables += [
'sources' : systemd_shutdown_sources,
'c_args' : '-DSTANDALONE',
'link_with' : [
libbasic,
libbasic_static,
libshared_static,
libsystemd_static,
],

2
src/sysusers/meson.build
View File

@ -14,7 +14,7 @@ executables += [
'sources' : files('sysusers.c'),
'c_args' : '-DSTANDALONE',
'link_with' : [
libbasic,
libbasic_static,
libshared_static,
libsystemd_static,
],

8
src/test/meson.build
View File

@ -274,7 +274,7 @@ executables += [
# only static linking apart from libdl, to make sure that the
# module is linked to all libraries that it uses.
'sources' : files('test-dlopen.c'),
'link_with' : libbasic,
'link_with' : libbasic_static,
'dependencies' : libdl,
'install' : false,
'type' : 'manual',
@ -410,7 +410,7 @@ executables += [
},
test_template + {
'sources' : files('test-sizeof.c'),
'link_with' : libbasic,
'link_with' : libbasic_static,
},
test_template + {
'sources' : files('test-time-util.c'),
@ -590,7 +590,7 @@ executables += [
test_template + {
'sources' : files('../libsystemd/sd-device/test-sd-device-thread.c'),
'link_with' : [
libbasic,
libbasic_static,
libsystemd,
],
'dependencies' : threads,
@ -598,7 +598,7 @@ executables += [
test_template + {
'sources' : files('../libudev/test-udev-device-thread.c'),
'link_with' : [
libbasic,
libbasic_static,
libudev,
],
'dependencies' : threads,

2
src/tmpfiles/meson.build
View File

@ -20,7 +20,7 @@ executables += [
'sources' : systemd_tmpfiles_sources,
'c_args' : '-DSTANDALONE',
'link_with' : [
libbasic,
libbasic_static,
libshared_static,
libsystemd_static,
],