shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-03 01:17:45 +03:00
Code

meson: allow to fallback to use libxcrypt.pc or glibc's libcrypt

Browse Source 
Some distributions still use glibc's libcrypt. In that case, libcrypt.pc
does not exist and dependency() will fail.
Also, even if libxcrypt is used, there may not be a symlink
from libcrypt.pc to libxcrypt.pc. So, let's add a secondary name.

Follow-up for d625f717db.

Fixes #28289.

[ fixed to fallback to extra dependency() call as multiple deps require meson 0.60 ]

(cherry picked from commit 555737878f)
(cherry picked from commit 087b9a70b0)
(cherry picked from commit 6f7b7b661e)
This commit is contained in:
Yu Watanabe 2023-07-07 18:49:04 +09:00 committed by Luca Boccassi
parent 725bde83bd
commit ce32489b1e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
meson.build
View File

@ -998,7 +998,14 @@ threads = dependency('threads')
librt = cc.find_library('rt')
libm = cc.find_library('m')
libdl = cc.find_library('dl')
libcrypt = dependency('libcrypt')
libcrypt = dependency('libcrypt', required : false)
if not libcrypt.found()
libcrypt = dependency('libxcrypt', required : false)
endif
if not libcrypt.found()
# fallback to use find_library() if libcrypt is provided by glibc, e.g. for LibreELEC.
libcrypt = cc.find_library('crypt')
endif
libcap = dependency('libcap')
# On some architectures, libatomic is required. But on some installations,