meson: remove deprecated get_pkgconfig_variable
Since meson 0.56, the `get_pkgconfig_variable` has been deprecated. In
meson 0.58 the `get_variable` was enhanced to no longer require the
`pkgconfig` keyword argument. Ensure meson 0.58 is required and update
the usage of all `get_pkgconfig_variable` and `get_variable` to be the
modern variant.
Change-Id: Ibc0692c5cd05546e797c20973e1c1f172dcb8379
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
diff --git a/meson.build b/meson.build
index 356e737..d6a3be6 100644
--- a/meson.build
+++ b/meson.build
@@ -16,7 +16,7 @@
'google-misc',
'c',
version: '0.1',
- meson_version: '>=0.57.0',
+ meson_version: '>=0.58.0',
default_options: [
'warning_level=3',
'werror=true',
diff --git a/subprojects/acpi-power-state-daemon/meson.build b/subprojects/acpi-power-state-daemon/meson.build
index c6b8f72..5b312ac 100644
--- a/subprojects/acpi-power-state-daemon/meson.build
+++ b/subprojects/acpi-power-state-daemon/meson.build
@@ -26,7 +26,7 @@
headers = include_directories('.')
systemd = dependency('systemd')
-systemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+systemunitdir = systemd.get_variable('systemdsystemunitdir')
deps = [
systemd,
diff --git a/subprojects/dhcp-done/meson.build b/subprojects/dhcp-done/meson.build
index 8f0272f..2ee0826 100644
--- a/subprojects/dhcp-done/meson.build
+++ b/subprojects/dhcp-done/meson.build
@@ -16,7 +16,7 @@
'dhcp-done',
'cpp',
version: '0.1',
- meson_version: '>=0.57.0',
+ meson_version: '>=0.58.0',
default_options: [
'warning_level=3',
'werror=true',
@@ -40,7 +40,7 @@
install_dir: libexecdir)
systemd = dependency('systemd')
-systemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+systemunitdir = systemd.get_variable('systemdsystemunitdir')
configure_file(
configuration: {'BIN': libexecdir / 'dhcp-done'},
diff --git a/subprojects/libcr51sign/meson.build b/subprojects/libcr51sign/meson.build
index f122686..7777285 100644
--- a/subprojects/libcr51sign/meson.build
+++ b/subprojects/libcr51sign/meson.build
@@ -16,7 +16,7 @@
'libcr51sign',
'c',
version: '0.1',
- meson_version: '>=0.57.0',
+ meson_version: '>=0.58.0',
default_options: [
'warning_level=3',
'werror=true',
diff --git a/subprojects/ncsid/meson.build b/subprojects/ncsid/meson.build
index af6037a..a813ba4 100644
--- a/subprojects/ncsid/meson.build
+++ b/subprojects/ncsid/meson.build
@@ -16,7 +16,7 @@
'gbmc-ncsid',
['cpp', 'c'],
version: '0.1',
- meson_version: '>=0.57.0',
+ meson_version: '>=0.58.0',
default_options: [
'warning_level=3',
'werror=true',
diff --git a/subprojects/ncsid/src/meson.build b/subprojects/ncsid/src/meson.build
index 9d3137f..8b01470 100644
--- a/subprojects/ncsid/src/meson.build
+++ b/subprojects/ncsid/src/meson.build
@@ -89,7 +89,7 @@
install_dir: get_option('libexecdir'))
systemd = dependency('systemd')
-systemunitdir = systemd.get_pkgconfig_variable('systemdsystemunitdir')
+systemunitdir = systemd.get_variable('systemdsystemunitdir')
libexecdir = get_option('prefix') / get_option('libexecdir')