diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-02-29 04:34:21 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2020-03-02 16:40:08 +0530 |
| commit | 4deb822d34b89d7dbddf7ab6556df1a862830216 (patch) | |
| tree | 7df77e0e9876b078d5fd7b538873c9cd53a1cc2e /recipes/libnice.recipe | |
| parent | dbde43be4ff7c22a46b54dbfd88bed56bdccba21 (diff) | |
recipes: Move from gnutls + openssl to only openssl
Previously, all our recipes were linking to either openssl or gnutls.
As a result, we were shipping *two* TLS implementations, which is
messy because it means consumers of Cerbero and our binaries had to
configure the certdb twice (thrice if you count glib-networking), do
a security audit of two TLS implementations, and generally had
increased binary sizes because of this.
Since we require openssl for the DTLS plugin (used by webrtcbin), and
all the other recipes can pick either openssl or gnutls, we have to go
with openssl.
This involved importing patches from vcpkg to port librtmp to the
latest OpenSSL 1.1.1 version since upstream is non-existent.
We have also deleted the following recipes: gmp, nettle, libtasn1,
gnutls.
Diffstat (limited to 'recipes/libnice.recipe')
| -rw-r--r-- | recipes/libnice.recipe | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/recipes/libnice.recipe b/recipes/libnice.recipe index bd549de3..608f8aa8 100644 --- a/recipes/libnice.recipe +++ b/recipes/libnice.recipe @@ -13,9 +13,10 @@ class Recipe(recipe.Recipe): meson_options = {'tests' : 'disabled', 'gupnp' : 'disabled', 'gstreamer' : 'enabled', - 'crypto-library' : 'gnutls'} - deps = ['glib', 'gstreamer-1.0', 'gnutls'] - patches = [] + 'crypto-library' : 'openssl'} + deps = ['glib', 'gstreamer-1.0'] + # openssl on Linux + use_system_libs = True files_bins = ['stunbdc', 'stund'] files_libs = ['libnice'] @@ -30,8 +31,12 @@ class Recipe(recipe.Recipe): ] # FIXME - if_arp.h? (iOS) + def prepare(self): + if self.config.target_platform != Platform.LINUX or self.config.cross_compiling(): + self.deps.append('openssl') + def post_install (self): - nice_deps = ['gio-2.0', 'gthread-2.0', 'gnutls'] + nice_deps = ['gio-2.0', 'gthread-2.0', 'ssl', 'crypto'] lib = LibtoolLibrary('nice', None, None, None, self.config.libdir, self.config.target_platform, deps=nice_deps) lib.save() |