jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-29 06:06:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "package/rtty: remove unnecessary cmake options"

Browse Source 
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 <thomas.petazzoni@bootlin.com>
This commit is contained in:
Thomas Petazzoni 2020-03-29 21:59:24 +02:00
parent 131216123b
commit 0f1ea7dc75
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
package/rtty/rtty.mk
View File

@ -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