mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 16:01:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

build: fix building with basu

Browse source 
02b412a introduced the use of list for sdbus deps, however
it was assuming that all packages which were in a list has a version
higher than 239. That is true for libsystemd and libelogind, since they
use the same versions, however basu is using version numbers which are
way lower than what libsystemd/libelogind are using, so basu only build
is failing.

(cherry picked from commit dbaf2e4fdb)
This commit is contained in:
Kirill Chibisov 2022-01-10 17:54:24 +03:00 committed by Simon Ser
parent 1a5db66366
commit 6bb3e7ee05
1 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
meson.build
View file

@ -92,15 +92,22 @@ if get_option('sd-bus-provider') == 'auto'
if not get_option('tray').disabled() if not get_option('tray').disabled()
assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto') assert(get_option('auto_features').auto(), 'sd-bus-provider must not be set to auto since auto_features != auto')
endif endif
sdbus = dependency(['libsystemd', 'libelogind', 'basu'], sdbus = dependency(['libsystemd', 'libelogind'],
required: get_option('tray'), required: false,
version: '>=239', version: '>=239',
) )
if not sdbus.found()
sdbus = dependency('basu', required: false)
endif
else else
sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray')) sdbus = dependency(get_option('sd-bus-provider'), required: get_option('tray'))
endif endif
have_tray = sdbus.found() tray_deps_found = sdbus.found()
if get_option('tray').enabled() and not tray_deps_found
error('Building with -Dtray=enabled, but sd-bus has not been not found')
endif
have_tray = (not get_option('tray').disabled()) and tray_deps_found
conf_data = configuration_data() conf_data = configuration_data()