From 8954e7ccc1f2005df221f50882f3253518c63159 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>

Date: Wed, 3 Jul 2024 16:51:05 +0200

Subject: [PATCH 1/3] meson: rename libbasic to libbasic_static

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 732ed8a84e8b264fccd3f5c0fc68ec2894b6d8ea)

---

 meson.build                | 4 ++--

 src/basic/meson.build      | 2 +-

 src/libsystemd/meson.build | 2 +-

 src/partition/meson.build  | 2 +-

 src/shared/meson.build     | 2 +-

 src/shutdown/meson.build   | 2 +-

 src/sysusers/meson.build   | 2 +-

 src/test/meson.build       | 8 ++++----

 src/tmpfiles/meson.build   | 2 +-

 9 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/meson.build b/meson.build

index b1a110cbfc..58748a37a3 100644

--- a/meson.build

+++ b/meson.build

@@ -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,

diff --git a/src/basic/meson.build b/src/basic/meson.build

index 9a214575a5..b538775576 100644

--- a/src/basic/meson.build

+++ b/src/basic/meson.build

@@ -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,

diff --git a/src/libsystemd/meson.build b/src/libsystemd/meson.build

index 6d4337d1a7..243549299f 100644

--- a/src/libsystemd/meson.build

+++ b/src/libsystemd/meson.build

@@ -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],

diff --git a/src/partition/meson.build b/src/partition/meson.build

index 52e1368116..2cfe43e029 100644

--- a/src/partition/meson.build

+++ b/src/partition/meson.build

@@ -32,7 +32,7 @@ executables += [

                 'sources' : files('repart.c'),

                 'c_args' : '-DSTANDALONE',

                 'link_with' : [

-                        libbasic,

+                        libbasic_static,

                         libshared_fdisk,

                         libshared_static,

                         libsystemd_static,

diff --git a/src/shared/meson.build b/src/shared/meson.build

index c5106d87d5..e513c0ec1c 100644

--- a/src/shared/meson.build

+++ b/src/shared/meson.build

@@ -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],

diff --git a/src/shutdown/meson.build b/src/shutdown/meson.build

index 219f9fd308..9bc60f83e5 100644

--- a/src/shutdown/meson.build

+++ b/src/shutdown/meson.build

@@ -20,7 +20,7 @@ executables += [

                 'sources' : systemd_shutdown_sources,

                 'c_args' : '-DSTANDALONE',

                 'link_with' : [

-                        libbasic,

+                        libbasic_static,

                         libshared_static,

                         libsystemd_static,

                 ],

diff --git a/src/sysusers/meson.build b/src/sysusers/meson.build

index 0f9c067d50..403d82a340 100644

--- a/src/sysusers/meson.build

+++ b/src/sysusers/meson.build

@@ -14,7 +14,7 @@ executables += [

                 'sources' : files('sysusers.c'),

                 'c_args' : '-DSTANDALONE',

                 'link_with' : [

-                        libbasic,

+                        libbasic_static,

                         libshared_static,

                         libsystemd_static,

                 ],

diff --git a/src/test/meson.build b/src/test/meson.build

index 3abbb94d9f..9d3c7d675f 100644

--- a/src/test/meson.build

+++ b/src/test/meson.build

@@ -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,

diff --git a/src/tmpfiles/meson.build b/src/tmpfiles/meson.build

index 2e918509a7..09ad839586 100644

--- a/src/tmpfiles/meson.build

+++ b/src/tmpfiles/meson.build

@@ -20,7 +20,7 @@ executables += [

                 'sources' : systemd_tmpfiles_sources,

                 'c_args' : '-DSTANDALONE',

                 'link_with' : [

-                        libbasic,

+                        libbasic_static,

                         libshared_static,

                         libsystemd_static,

                 ],