package/libnice: add optional dependency to openssl
Support for OpenSSL was added in version 0.1.15: https://lists.freedesktop.org/archives/nice/2018-December/001443.html With the option of using OpenSSL as a crypto provider, we can't keep GnuTLS as the default, because using: select BR2_PACKAGE_GNUTLS if !BR2_PACKAGE_OPENSSL causes a Kconfig circular dependency: package/openssl/Config.in:4:error: recursive dependency detected! package/openssl/Config.in:4: symbol BR2_PACKAGE_OPENSSL is selected by BR2_PACKAGE_GNUTLS package/gnutls/Config.in:1: symbol BR2_PACKAGE_GNUTLS is selected by BR2_PACKAGE_OPENSSL Signed-off-by: Bernd Kuhls <bernd.kuhls@t-online.de> [Thomas: pass --with-crypto-library argument] Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
f7b2e324e1
commit
d49cec2a2d
|
@ -4,7 +4,7 @@ config BR2_PACKAGE_LIBNICE
|
||||||
depends on BR2_USE_WCHAR # libglib2
|
depends on BR2_USE_WCHAR # libglib2
|
||||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
|
depends on BR2_TOOLCHAIN_HAS_THREADS # libglib2
|
||||||
depends on BR2_USE_MMU # fork()
|
depends on BR2_USE_MMU # fork()
|
||||||
select BR2_PACKAGE_GNUTLS
|
select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
|
||||||
select BR2_PACKAGE_LIBGLIB2
|
select BR2_PACKAGE_LIBGLIB2
|
||||||
help
|
help
|
||||||
Libnice is an implementation of the IETF's Interactive
|
Libnice is an implementation of the IETF's Interactive
|
||||||
|
|
|
@ -8,9 +8,19 @@ LIBNICE_VERSION = 0.1.16
|
||||||
LIBNICE_SITE = http://nice.freedesktop.org/releases
|
LIBNICE_SITE = http://nice.freedesktop.org/releases
|
||||||
LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1
|
LIBNICE_LICENSE = MPL-1.1 or LGPL-2.1
|
||||||
LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL
|
LIBNICE_LICENSE_FILES = COPYING COPYING.MPL COPYING.LGPL
|
||||||
LIBNICE_DEPENDENCIES = gnutls libglib2 host-pkgconf
|
LIBNICE_DEPENDENCIES = libglib2 host-pkgconf
|
||||||
LIBNICE_INSTALL_STAGING = YES
|
LIBNICE_INSTALL_STAGING = YES
|
||||||
|
|
||||||
|
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||||
|
LIBNICE_CONF_OPTS += --with-crypto-library=gnutls
|
||||||
|
LIBNICE_DEPENDENCIES += gnutls
|
||||||
|
else
|
||||||
|
LIBNICE_CONF_OPTS += \
|
||||||
|
--with-crypto-library=openssl \
|
||||||
|
--with-openssl=$(STAGING_DIR)/usr
|
||||||
|
LIBNICE_DEPENDENCIES += openssl
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
|
ifeq ($(BR2_PACKAGE_GST_PLUGINS_BASE),y)
|
||||||
LIBNICE_CONF_OPTS += --with-gstreamer-0.10
|
LIBNICE_CONF_OPTS += --with-gstreamer-0.10
|
||||||
LIBNICE_DEPENDENCIES += gst-plugins-base
|
LIBNICE_DEPENDENCIES += gst-plugins-base
|
||||||
|
|
Loading…
Reference in a new issue