mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-25 09:21:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: use WLR_HAS_* to decide whether suid is required

Browse source 
Maybe systemd/elogind is found but wlroots was built without them. Print
the warning message depending on the WLR_HAS_* defines instead.

While at it, don't print the message if wlroots has been build with
libseat.
This commit is contained in:
Simon Ser 2020-12-02 23:43:43 +01:00 committed by Brian Ashworth
parent a1591c23d2
commit 968c005760
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
meson.build
View file

@ -67,19 +67,31 @@ wlroots_proj = subproject(
required: false, required: false,
version: wlroots_version, version: wlroots_version,
) )
wlroots_features = {
'xwayland': false,
'systemd': false,
'elogind': false,
'libseat': false,
}
if wlroots_proj.found() if wlroots_proj.found()
wlroots = wlroots_proj.get_variable('wlroots') wlroots = wlroots_proj.get_variable('wlroots')
wlroots_conf = wlroots_proj.get_variable('conf_data') wlroots_conf = wlroots_proj.get_variable('conf_data')
wlroots_has_xwayland = wlroots_conf.get('WLR_HAS_XWAYLAND') == 1 foreach name, _ : wlroots_features
has = wlroots_conf.get('WLR_HAS_' + name.to_upper()) == 1
wlroots_features += { name: has }
endforeach
else else
wlroots = dependency('wlroots', version: wlroots_version) wlroots = dependency('wlroots', version: wlroots_version)
wlroots_has_xwayland = cc.get_define('WLR_HAS_XWAYLAND', prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1' foreach name, _ : wlroots_features
has = cc.get_define('WLR_HAS_' + name.to_upper(), prefix: '#include <wlr/config.h>', dependencies: wlroots) == '1'
wlroots_features += { name: has }
endforeach
endif endif
if get_option('xwayland').enabled() and not wlroots_has_xwayland if get_option('xwayland').enabled() and not wlroots_features['xwayland']
error('Cannot enable Xwayland in sway: wlroots has been built without Xwayland support') error('Cannot enable Xwayland in sway: wlroots has been built without Xwayland support')
endif endif
have_xwayland = xcb.found() and wlroots_has_xwayland have_xwayland = xcb.found() and wlroots_features['xwayland']
tray_deps_found = systemd.found() or elogind.found() tray_deps_found = systemd.found() or elogind.found()
if get_option('tray').enabled() and not tray_deps_found if get_option('tray').enabled() and not tray_deps_found
@ -285,7 +297,7 @@ summary({
'man-pages': scdoc.found(), 'man-pages': scdoc.found(),
}, bool_yn: true) }, bool_yn: true)
if not systemd.found() and not elogind.found() if not wlroots_features['systemd'] and not wlroots_features['elogind'] and not wlroots_features['libseat']
warning('The sway binary must be setuid when compiled without (e)logind') warning('The sway binary must be setuid when compiled without (e)logind or libseat')
warning('You must do this manually post-install: chmod a+s /path/to/sway') warning('You must do this manually post-install: chmod a+s /path/to/sway')
endif endif