From 19294eb352feb9cc96bc7eeb8942da27f715ab87 Mon Sep 17 00:00:00 2001 From: Fabrice Fontaine Date: Sat, 12 Mar 2022 19:12:49 +0100 Subject: [PATCH] package/libsrtp: drop shared library dependency from openssl openssl handling needs shared library support since commit 67cebbdf5f349cc176037fa15c281a9462dae591 however this is not needed since version 2 and https://github.com/cisco/libsrtp/commit/333fa84e8ed1395753fd1c0c4eb5534208510f26 Signed-off-by: Fabrice Fontaine Signed-off-by: Yann E. MORIN --- package/asterisk/asterisk.mk | 2 +- package/libsrtp/libsrtp.mk | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index 0a26fb38ea..2b7854b982 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp endif # asterisk needs an openssl-enabled libsrtp -ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yyx) +ifeq ($(BR2_PACKAGE_LIBSRTP)$(BR2_PACKAGE_OPENSSL),yy) ASTERISK_DEPENDENCIES += libsrtp ASTERISK_CONF_OPTS += --with-srtp else diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk index f2ba600dd6..e7a771c6b2 100644 --- a/package/libsrtp/libsrtp.mk +++ b/package/libsrtp/libsrtp.mk @@ -21,8 +21,7 @@ endif LIBSRTP_DEPENDENCIES = host-pkgconf -# openssl handling needs libdl support -ifeq ($(BR2_PACKAGE_OPENSSL)x$(BR2_STATIC_LIBS),yx) +ifeq ($(BR2_PACKAGE_OPENSSL),y) LIBSRTP_DEPENDENCIES += openssl LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl else ifeq ($(BR2_PACKAGE_LIBNSS),y)