Browse Source

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 <fontaine.fabrice@gmail.com>
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr>
(cherry picked from commit 19294eb352feb9cc96bc7eeb8942da27f715ab87)
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Fabrice Fontaine 3 years ago
parent
commit
330d79828d
2 changed files with 2 additions and 3 deletions
  1. 1 1
      package/asterisk/asterisk.mk
  2. 1 2
      package/libsrtp/libsrtp.mk

+ 1 - 1
package/asterisk/asterisk.mk

@@ -247,7 +247,7 @@ ASTERISK_CONF_OPTS += --without-speex --without-speexdsp
 endif
 endif
 
 
 # asterisk needs an openssl-enabled libsrtp
 # 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_DEPENDENCIES += libsrtp
 ASTERISK_CONF_OPTS += --with-srtp
 ASTERISK_CONF_OPTS += --with-srtp
 else
 else

+ 1 - 2
package/libsrtp/libsrtp.mk

@@ -21,8 +21,7 @@ endif
 
 
 LIBSRTP_DEPENDENCIES = host-pkgconf
 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_DEPENDENCIES += openssl
 LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl
 LIBSRTP_CONF_OPTS += --disable-nss --enable-openssl
 else ifeq ($(BR2_PACKAGE_LIBNSS),y)
 else ifeq ($(BR2_PACKAGE_LIBNSS),y)