commit f62ad6fc53bbc38e5ce27b8b43c35324191bb4b7
author Patrick Williams <patrick@stwcx.xyz> Tue Sep 03 16:15:14 2024 -0400
committer Patrick Williams <patrick@stwcx.xyz> Mon Jan 20 21:06:38 2025 +0000
tree 25bb649a2beb5c84693682a28657e375bf8d298e
parent 0c6561da77f7ec932c6808dca2a7466d5f60f4ea

meson: switch code dependency to libsystemd

For a while now systemd has packaged a separate `libsystemd`.  For
meson dependency, `systemd` should be used when looking for systemd
service file paths and `libsystemd` should be used for `sd_*` functions.

Update the dependency accordingly.

Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I9768dd66c4180085f201a0b77385d696bdd1680f

libipmid/meson.build

diff --git a/libipmid/meson.build b/libipmid/meson.build
index ebd932c..20dbfe1 100644
--- a/libipmid/meson.build
+++ b/libipmid/meson.build
@@ -1,9 +1,9 @@
 ipmid_pre = [
   boost,
+  libsystemd_dep,
   phosphor_dbus_interfaces_dep,
   phosphor_logging_dep,
   sdbusplus_dep,
-  systemd,
 ]
 
 entity_map_json_lib = static_library(

meson.build

diff --git a/meson.build b/meson.build
index 6ec5dca..e244f85 100644
--- a/meson.build
+++ b/meson.build
@@ -140,7 +140,7 @@
 phosphor_logging_dep = dependency('phosphor-logging')
 phosphor_dbus_interfaces_dep = dependency('phosphor-dbus-interfaces')
 sdeventplus_dep = dependency('sdeventplus')
-systemd = dependency('systemd')
+libsystemd_dep = dependency('libsystemd')
 crypto = dependency('libcrypto', version : '>=1.0.2g')
 pam = cpp.find_library('pam', required: true)
 sdbusplus_dep = dependency('sdbusplus')

softoff/meson.build

diff --git a/softoff/meson.build b/softoff/meson.build
index cdc5d03..1d52b8e 100644
--- a/softoff/meson.build
+++ b/softoff/meson.build
@@ -1,12 +1,12 @@
 softpower_pre = [
+  boost,
   ipmid_dep,
-  phosphor_logging_dep,
+  libsystemd_dep,
   phosphor_dbus_interfaces_dep,
-  sdeventplus_dep,
+  phosphor_logging_dep,
   sdbusplus_dep,
-  systemd,
+  sdeventplus_dep,
   softoff_dbus,
-  boost
 ]
 
 softpower_lib = static_library(

test/meson.build

diff --git a/test/meson.build b/test/meson.build
index 607c873..607e2a0 100644
--- a/test/meson.build
+++ b/test/meson.build
@@ -59,7 +59,15 @@
     build_by_default: false,
     override_options: ['b_lundef=true'],
     implicit_include_directories: false,
-    dependencies: [boost, phosphor_logging_dep, crypto, systemd, sdbusplus_dep, gtest, gmock]
+    dependencies: [
+        boost,
+        crypto,
+        gmock,
+        gtest,
+        libsystemd_dep,
+        phosphor_logging_dep,
+        sdbusplus_dep,
+    ]
   ))
 
 # Build/add closesession_unittest to test suite

user_channel/meson.build

diff --git a/user_channel/meson.build b/user_channel/meson.build
index d4f1126..a18ed06 100644
--- a/user_channel/meson.build
+++ b/user_channel/meson.build
@@ -5,10 +5,10 @@
   dependencies: [
     crypto,
     ipmid_dep,
+    libsystemd_dep,
     nlohmann_json_dep,
     phosphor_dbus_interfaces_dep,
     phosphor_logging_dep,
-    systemd,
   ])
 
 channellayer_src = [
@@ -44,11 +44,11 @@
       channellayer_dep,
       crypto,
       ipmid_dep,
+      libsystemd_dep,
       nlohmann_json_dep,
       pam,
       phosphor_dbus_interfaces_dep,
       phosphor_logging_dep,
-      systemd,
     ])
 
   userlayer_src = [