Skip to content

Commit

Permalink
src/CMakeLists.txt: fix static build with mbedtls and zlib
Browse files Browse the repository at this point in the history
Static build with a zlib-enabled mbedtls fails on:

[100%] Linking C executable rtty
/home/buildroot/autobuild/instance-2/output-1/host/opt/ext-toolchain/bin/../lib/gcc/microblazeel-buildroot-linux-uclibc/8.3.0/../../../../microblazeel-buildroot-linux-uclibc/bin/ld:
/home/buildroot/autobuild/instance-2/output-1/host/microblazeel-buildroot-linux-uclibc/sysroot/usr/lib/libmbedtls.a(ssl_tls.c.o):
in function `mbedtls_ssl_transform_free.part.24':
(.text+0x1724): undefined reference to `deflateEnd'

As mbedtls does not provide a pkg-config file, search for zlib and link
with it if necessary

Fixes:
 - http://autobuild.buildroot.org/results/61de143cdde1f0a9e734f46e9c68ce3504989890

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
  • Loading branch information
ffontaine committed May 2, 2020
1 parent 0b37394 commit 7b8efe1
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion src/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,7 @@ else()
endif()
find_package(WolfSSL)
find_package(MbedTLS)
find_package(ZLIB)

if(RTTY_USE_OPENSSL)
if (NOT OPENSSL_FOUND)
Expand Down Expand Up @@ -76,7 +77,7 @@ else()
elseif(RTTY_USE_MBEDTLS)
set(SSL_NAME "MbedTLS(PolarSSL)")
set(SSL_INC ${MBEDTLS_INCLUDE_DIR})
set(SSL_LIB ${MBEDTLS_LIBRARIES})
set(SSL_LIB ${MBEDTLS_LIBRARIES} ${ZLIB_LIBRARIES})
set(RTTY_HAVE_MBEDTLS_CONFIG 1)
endif()

Expand Down

0 comments on commit 7b8efe1

Please sign in to comment.