Skip to content

Commit a99850c

Browse files
authored
Update meson to use mbedtls3 (#174)
1 parent b612b33 commit a99850c

1 file changed

Lines changed: 5 additions & 26 deletions

File tree

meson.build

Lines changed: 5 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -8,35 +8,14 @@ cc = meson.get_compiler('c')
88

99
zlib_dep = dependency('zlib')
1010
lzma_dep = dependency('liblzma')
11-
mbedtls_dep = dependency('mbedtls', version: '<3', required: false)
1211
libgit2_dep = dependency('libgit2')
1312
libzip_dep = dependency('libzip')
1413
lua_dep = dependency('lua')
15-
16-
if mbedtls_dep.found()
17-
mbedtls_dep = [
18-
mbedtls_dep,
19-
dependency('mbedx509', version: '<3', required: true),
20-
dependency('mbedcrypto', version: '<3', required: true),
21-
]
22-
else
23-
# Using has_headers to distinguish between mbedtls2 and mbedtls3
24-
_mbedtls_dep = cc.find_library('mbedtls', has_headers: 'mbedtls/net.h', required: false)
25-
if _mbedtls_dep.found()
26-
mbedtls_dep = [
27-
_mbedtls_dep,
28-
cc.find_library('mbedx509'),
29-
cc.find_library('mbedcrypto'),
30-
]
31-
else
32-
# In some cases we need to manually specify where to find mbedtls2
33-
message('Using fallback mbedtls definition')
34-
mbedtls_dep = declare_dependency(
35-
include_directories: ['/usr/include/mbedtls2/'],
36-
link_args: ['-L/usr/lib/mbedtls2', '-lmbedtls', '-lmbedx509', '-lmbedcrypto']
37-
)
38-
endif
39-
endif
14+
mbedtls_dep = [
15+
dependency('mbedtls'),
16+
dependency('mbedx509'),
17+
dependency('mbedcrypto'),
18+
]
4019

4120
microtar_lib = static_library('microtar', files('lib/microtar/src/microtar.c'))
4221
microtar_dep = declare_dependency(

0 commit comments

Comments
 (0)