From: Ivan Kruglov <mail@ikruglov.com>
Date: Tue, 12 Nov 2024 12:53:13 +0000 (+0100)
Subject: meson: introduce PROJECT_VERSION_STR and use it in udev
X-Git-Tag: v258-rc1~636^2~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8c823a038cdadb42ea270f22341136990de295da;p=thirdparty%2Fsystemd.git

meson: introduce PROJECT_VERSION_STR and use it in udev
---

diff --git a/meson.build b/meson.build
index 48b8b058349..ebe24c6290f 100644
--- a/meson.build
+++ b/meson.build
@@ -33,6 +33,8 @@ conf = configuration_data()
 conf.set_quoted('PROJECT_URL', 'https://systemd.io/')
 conf.set('PROJECT_VERSION', project_major_version,
          description : 'Numerical project version (used where a simple number is expected)')
+conf.set_quoted('PROJECT_VERSION_STR', project_major_version,
+        description: 'Stringified project version (used where a simple string is expected)')
 conf.set_quoted('PROJECT_VERSION_FULL', meson.project_version(), description : 'Full project version')
 
 relative_source_path = run_command('realpath',
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c
index 1914bf7929f..10dd48164a2 100644
--- a/src/udev/udev-ctrl.c
+++ b/src/udev/udev-ctrl.c
@@ -293,7 +293,7 @@ int udev_ctrl_start(UdevCtrl *uctrl, udev_ctrl_handler_t callback, void *userdat
 
 int udev_ctrl_send(UdevCtrl *uctrl, UdevCtrlMessageType type, const void *data) {
         UdevCtrlMessageWire ctrl_msg_wire = {
-                .version = "udev-" STRINGIFY(PROJECT_VERSION),
+                .version = "udev-" PROJECT_VERSION_STR,
                 .magic = UDEV_CTRL_MAGIC,
                 .type = type,
         };
diff --git a/src/udev/udevadm.h b/src/udev/udevadm.h
index e39dbf655d4..665d2f46b37 100644
--- a/src/udev/udevadm.h
+++ b/src/udev/udevadm.h
@@ -20,6 +20,6 @@ int lock_main(int argc, char *argv[], void *userdata);
 
 static inline int print_version(void) {
         /* Dracut relies on the version being a single integer */
-        puts(STRINGIFY(PROJECT_VERSION));
+        puts(PROJECT_VERSION_STR);
         return 0;
 }