package/glib-networking: needs dynamic library
authorFabrice Fontaine <fontaine.fabrice@gmail.com>
Thu, 1 Aug 2019 10:49:18 +0000 (12:49 +0200)
committerPeter Korsgaard <peter@korsgaard.com>
Thu, 1 Aug 2019 17:38:46 +0000 (19:38 +0200)
glib-networking uses the meson's shared_module function

This is a partly revert of commit
ed3eef6bb49270de619e5a86a249fdd8724c40cd 'package/glib-networking: bump
to version 2.61.1' re-adding the dynamic library dependency due to the
meson's build system and not from gnutls

Fixes:
 - http://autobuild.buildroot.org/results/60037e37e020404485df9814f3f3ad4e3b2abdb3

Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
package/glib-networking/Config.in
package/libsoup/Config.in
package/webkitgtk/Config.in

index 004f82222c7d4854aae62b53a0706b88b4dac554..e9557309ee150b902e24385a7aecc32281862605 100644 (file)
@@ -3,11 +3,13 @@ config BR2_PACKAGE_GLIB_NETWORKING
        depends on BR2_USE_WCHAR # glib2
        depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
        depends on BR2_USE_MMU # glib2
+       depends on !BR2_STATIC_LIBS
        select BR2_PACKAGE_LIBGLIB2
        select BR2_PACKAGE_OPENSSL if !BR2_PACKAGE_GNUTLS
        help
          Network-related GIO modules for glib.
 
-comment "glib-networking needs a toolchain w/ wchar, threads"
+comment "glib-networking needs a toolchain w/ wchar, threads, dynamic library"
        depends on BR2_USE_MMU
-       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
+       depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || \
+               BR2_STATIC_LIBS
index 599f9594d932ea0f3230a2db38c68d2780ff41ce..f6f8fde968f7ab6b4f04eaea2a67481e034b8f12 100644 (file)
@@ -22,7 +22,7 @@ config BR2_PACKAGE_LIBSOUP_GNOME
 
 config BR2_PACKAGE_LIBSOUP_SSL
        bool "https support"
-       depends on !BR2_STATIC_LIBS # gnutls
+       depends on !BR2_STATIC_LIBS # glib-networking, gnutls
        select BR2_PACKAGE_GLIB_NETWORKING
        select BR2_PACKAGE_GNUTLS
        help
index 9f0d4a776cc0108578662c2869a890787913f142..db67c8904249acb6dfe5902df7560df3c4ee6db9 100644 (file)
@@ -59,7 +59,7 @@ if BR2_PACKAGE_WEBKITGTK
 
 config BR2_PACKAGE_WEBKITGTK_HTTPS
        bool "HTTPS support"
-       depends on !BR2_STATIC_LIBS # gnutls -> libsoup
+       depends on !BR2_STATIC_LIBS # libsoup -> glib-networking, gnutls
        select BR2_PACKAGE_CA_CERTIFICATES # runtime
        select BR2_PACKAGE_LIBSOUP_SSL
        help