Skip to content

Commit

Permalink
meson: remove deprecated get_pkgconfig_variable
Browse files Browse the repository at this point in the history
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: Icc8dd9d7e7d229ec090eb631365e5952b8b755b4
Signed-off-by: Patrick Williams <[email protected]>
  • Loading branch information
williamspatrick committed Apr 12, 2023
1 parent 9b837f6 commit fe34ccd
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ project(
],
license: 'Apache-2.0',
version: '1.0',
meson_version: '>=0.57.0',
meson_version: '>=0.58.0',
)

if(get_option('buildtype') == 'minsize')
Expand Down Expand Up @@ -218,7 +218,7 @@ unit_files = [
] + extra_unit_files

systemd_system_unit_dir = dependency('systemd').get_variable(
pkgconfig: 'systemdsystemunitdir',
'systemdsystemunitdir',
pkgconfig_define: ['prefix', get_option('prefix')])
foreach u : unit_files
configure_file(
Expand All @@ -231,7 +231,7 @@ foreach u : unit_files
endforeach

dbus_system_bus_services_dir = dependency('dbus-1').get_variable(
pkgconfig: 'system_bus_services_dir',
'system_bus_services_dir',
pkgconfig_define: ['prefix', get_option('prefix')])
dbus_policy_dir = run_command(
'realpath',
Expand Down

0 comments on commit fe34ccd

Please sign in to comment.