[Buildroot] [PATCH 1/2] package/libsrtp: don't error out if libdl and zlib are not found

[Buildroot] [PATCH 1/2] package/libsrtp: don't error out if libdl and zlib are not found

[Romain Naour]

Depending on how openssl was compiled, libdl and zlib may not be
necessary for linking with libcrypto.a.

Upstream turn the error to a warning.
https://github.com/cisco/libsrtp/commit/13fd694ae216fcdbc7165bcf77be9e5a1acbecfa

Ref:
https://github.com/cisco/libsrtp/issues/97

Signed-off-by: Romain Naour <romain.naour@openwide.fr>
---
 .../0002-A-autoconf-checks-for-libz-and-libdl-when-OpenSSL-is.patch   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package/libsrtp/0002-A-autoconf-checks-for-libz-and-libdl-when-OpenSSL-is.patch b/package/libsrtp/0002-A-autoconf-checks-for-libz-and-libdl-when-OpenSSL-is.patch
index acb2c9a..1240d9f 100644
--- a/package/libsrtp/0002-A-autoconf-checks-for-libz-and-libdl-when-OpenSSL-is.patch
+++ b/package/libsrtp/0002-A-autoconf-checks-for-libz-and-libdl-when-OpenSSL-is.patch
@@ -22,9 +22,9 @@ index ee30daf..71df46b 100644
     CFLAGS="$CFLAGS $(pkg-config --cflags openssl)";
  
 +   AC_CHECK_LIB([dl], [dlopen], [],
-+             [AC_MSG_FAILURE([can't find libdl])])
++             [AC_MSG_WARN([can't find libdl])])
 +   AC_CHECK_LIB([z], [inflate], [],
-+             [AC_MSG_FAILURE([can't find libz])])
++             [AC_MSG_WARN([can't find libz])])
     AC_CHECK_LIB([crypto], [EVP_EncryptInit], [],
               [AC_MSG_FAILURE([can't find openssl >1.0.1 crypto lib])])
     AC_CHECK_LIB([crypto], [EVP_aes_128_ctr], [],
-- 
1.9.3

[Buildroot] [PATCH 2/2] Revert "libsrtp: openssl handling needs shared library support"

[Romain Naour]

openssl handling has been fixed by the previous commit.

This reverts commit 67cebbdf5f349cc176037fa15c281a9462dae591.
---
 package/libsrtp/libsrtp.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package/libsrtp/libsrtp.mk b/package/libsrtp/libsrtp.mk
index e5cf47b..5e62255 100644
--- a/package/libsrtp/libsrtp.mk
+++ b/package/libsrtp/libsrtp.mk
@@ -25,8 +25,7 @@ endif
 # host-pkgconf to make sure pkg-config is installed.
 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 += --enable-openssl
 else
-- 
1.9.3