Cypher_Stack/libsecret
2
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libsecret.git synced 2024-12-22 04:38:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'crypto-options' into 'master'

Browse Source 
meson: Fix crypto option being silently ignored

See merge request GNOME/libsecret!137
This commit is contained in:
Niels De Graef 2024-02-21 13:19:37 +00:00
commit bf362eeef0
2 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -1,4 +1,4 @@
image: registry.gitlab.gnome.org/gnome/libsecret/master:v5 image: registry.gitlab.gnome.org/gnome/libsecret/master:v6
stages: stages:
- build - build

18
meson.build
View File

@ -41,25 +41,19 @@ if get_option('crypto') == 'libgcrypt'
gcrypt_dep = dependency( gcrypt_dep = dependency(
'libgcrypt', 'libgcrypt',
version: '>=' + min_libgcrypt_version, version: '>=' + min_libgcrypt_version,
required: false,
) )
if gcrypt_dep.found() with_gcrypt = true
with_gcrypt = true with_crypto = true
with_crypto = true crypto_deps += gcrypt_dep
crypto_deps += gcrypt_dep
endif
elif get_option('crypto') == 'gnutls' elif get_option('crypto') == 'gnutls'
min_gnutls_version = '3.8.2' min_gnutls_version = '3.8.2'
gnutls_dep = dependency( gnutls_dep = dependency(
'gnutls', 'gnutls',
version: '>=' + min_gnutls_version, version: '>=' + min_gnutls_version,
required: false,
) )
if gnutls_dep.found() with_gnutls = true
with_gnutls = true with_crypto = true
with_crypto = true crypto_deps += gnutls_dep
crypto_deps += gnutls_dep
endif
endif endif
min_tss2_version = '3.0.3' min_tss2_version = '3.0.3'