mirror of
git://slackware.nl/current.git
synced 2024-12-28 09:59:53 +01:00
79267f6e54
d/cmake-3.29.2-x86_64-1.txz: Upgraded. l/polkit-124-x86_64-1.txz: Upgraded. Thanks to marav for the patches.
28 lines
1.5 KiB
Diff
28 lines
1.5 KiB
Diff
https://bugs.gentoo.org/922458
|
|
https://github.com/polkit-org/polkit/pull/417/files#r1458416421
|
|
--- a/meson.build
|
|
+++ b/meson.build
|
|
@@ -212,14 +212,17 @@ if enable_logind
|
|
config_h.set10('HAVE_' + func.to_upper(), cc.has_function(func, dependencies: logind_dep))
|
|
|
|
# systemd unit / service files
|
|
- systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
|
|
systemd_systemdsystemunitdir = get_option('systemdsystemunitdir')
|
|
- if systemd_systemdsystemunitdir == '' and session_tracking == 'libsystemd-login'
|
|
- # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
|
|
- systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
|
|
- endif
|
|
+ if session_tracking == 'libsystemd-login'
|
|
+ systemd_dep = dependency('systemd', not_found_message: 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
|
|
|
|
- systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d')
|
|
+ if systemd_systemdsystemunitdir == ''
|
|
+ # FIXME: systemd.pc file does not use variables with relative paths, so `define_variable` cannot be used
|
|
+ systemd_systemdsystemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
|
|
+ endif
|
|
+
|
|
+ systemd_sysusers_dir = systemd_dep.get_pkgconfig_variable('sysusers_dir', default: '/usr/lib/sysusers.d')
|
|
+ endif
|
|
endif
|
|
config_h.set('HAVE_LIBSYSTEMD', enable_logind)
|
|
|