From 0f1ea7dc752a417560510d5314ebc04f66bf6445 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Sun, 29 Mar 2020 21:59:24 +0200 Subject: [PATCH] Revert "package/rtty: remove unnecessary cmake options" This reverts commit 7f169e6bc3812d7f9160449d7724711e4df7e39e. As pointed out by Yann E. Morin, we really want to explicitly disable crypto backends, otherwise they will get automatically re-enabled if one of the dependencies is found: elseif(OPENSSL_FOUND) set(RTTY_USE_OPENSSL ON) elseif(WOLFSSL_FOUND) set(RTTY_USE_WOLFSSL ON) elseif(MBEDTLS_FOUND) set(RTTY_USE_MBEDTLS ON) But as usual, dependencies may incorrectly be found, so we want to explicitly disable. Signed-off-by: Thomas Petazzoni --- package/rtty/rtty.mk | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/package/rtty/rtty.mk b/package/rtty/rtty.mk index 5d1ef4a091..88599f6636 100644 --- a/package/rtty/rtty.mk +++ b/package/rtty/rtty.mk @@ -12,13 +12,25 @@ RTTY_DEPENDENCIES = libev ifeq ($(BR2_PACKAGE_MBEDTLS),y) RTTY_DEPENDENCIES += mbedtls -RTTY_CONF_OPTS += -DRTTY_USE_MBEDTLS=ON +RTTY_CONF_OPTS += \ + -DRTTY_SSL_SUPPORT=ON \ + -DRTTY_USE_MBEDTLS=ON \ + -DRTTY_USE_OPENSSL=OFF \ + -DRTTY_USE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_OPENSSL),y) RTTY_DEPENDENCIES += host-pkgconf openssl -RTTY_CONF_OPTS += -DRTTY_USE_OPENSSL=ON +RTTY_CONF_OPTS += \ + -DRTTY_SSL_SUPPORT=ON \ + -DRTTY_USE_MBEDTLS=OFF \ + -DRTTY_USE_OPENSSL=ON \ + -DRTTY_USE_WOLFSSL=OFF else ifeq ($(BR2_PACKAGE_WOLFSSL),y) RTTY_DEPENDENCIES += wolfssl -RTTY_CONF_OPTS += -DRTTY_USE_WOLFSSL=ON +RTTY_CONF_OPTS += \ + -DRTTY_SSL_SUPPORT=ON \ + -DRTTY_USE_MBEDTLS=OFF \ + -DRTTY_USE_OPENSSL=OFF \ + -DRTTY_USE_WOLFSSL=ON else RTTY_CONF_OPTS += -DRTTY_SSL_SUPPORT=OFF endif -- 2.30.2