commit 058f54ede5c78b12d43712df337a1a07cb69cdb7
author Patrick Williams <patrick@stwcx.xyz> Tue Sep 03 16:07:55 2024 -0400
committer Ed Tanous <ed@tanous.net> Tue Sep 03 22:48:05 2024 +0000
tree c8dbd814e13cdb286767543679ab5deb7ef1eb6b
parent 1a095906dcc9fdf76e6b86f6a9c7b5a53a9da050

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: Ie797742655ef9af8c93edd279cc162b842a711a2

meson.build

diff --git a/meson.build b/meson.build
index 65e5b54..4984d1a 100644
--- a/meson.build
+++ b/meson.build
@@ -257,10 +257,11 @@
 bmcweb_dependencies += tinyxml
 
 systemd = dependency('systemd')
-add_project_arguments('-DSYSTEMD_VERSION=' + systemd.version(), language: 'cpp')
+libsystemd = dependency('libsystemd')
+add_project_arguments('-DLIBSYSTEMD_VERSION=' + libsystemd.version(), language: 'cpp')
 
 zlib = dependency('zlib')
-bmcweb_dependencies += [systemd, zlib]
+bmcweb_dependencies += [libsystemd, zlib]
 
 nlohmann_json_dep = dependency(
     'nlohmann_json',

redfish-core/lib/manager_logservices_journal.hpp

diff --git a/redfish-core/lib/manager_logservices_journal.hpp b/redfish-core/lib/manager_logservices_journal.hpp
index 94ade20..17fb95b 100644
--- a/redfish-core/lib/manager_logservices_journal.hpp
+++ b/redfish-core/lib/manager_logservices_journal.hpp
@@ -429,7 +429,7 @@
 
     // Get the last sequence number
     uint64_t endSeqNum = 0;
-#if SYSTEMD_VERSION >= 254
+#if LIBSYSTEMD_VERSION >= 254
     {
         if (sd_journal_get_seqnum(journal.get(), &endSeqNum, nullptr) < 0)
         {
@@ -455,7 +455,7 @@
 
     // Get the first sequence number
     uint64_t startSeqNum = 0;
-#if SYSTEMD_VERSION >= 254
+#if LIBSYSTEMD_VERSION >= 254
     {
         if (sd_journal_get_seqnum(journal.get(), &startSeqNum, nullptr) < 0)
         {
@@ -500,7 +500,7 @@
         }
 
         uint64_t endChunkSeqNum = 0;
-#if SYSTEMD_VERSION >= 254
+#if LIBSYSTEMD_VERSION >= 254
         {
             if (sd_journal_get_seqnum(journal.get(), &endChunkSeqNum, nullptr) <
                 0)
@@ -525,7 +525,7 @@
             return;
         }
         uint64_t startChunkSeqNum = 0;
-#if SYSTEMD_VERSION >= 254
+#if LIBSYSTEMD_VERSION >= 254
         {
             if (sd_journal_get_seqnum(journal.get(), &startChunkSeqNum,
                                       nullptr) < 0)