package/glib-networking: bump to version 2.61.1
- gnutls can be made optional again since14a3138a6d
- add openssl optional dependency - pkcs option has been removed since4d6caa0330
- use new options, see8629f3d5a5
- fix build failure with gnutls Fixes: - http://autobuild.buildroot.org/results/e233f9a5693e18bee90669910007e122857c7f77 Signed-off-by: Fabrice Fontaine <fontaine.fabrice@gmail.com> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
parent
023c5328d4
commit
ed3eef6bb4
|
@ -1,14 +1,12 @@
|
|||
config BR2_PACKAGE_GLIB_NETWORKING
|
||||
bool "glib-networking"
|
||||
depends on BR2_USE_WCHAR # glib2, gnutls
|
||||
depends on BR2_USE_WCHAR # glib2
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
|
||||
depends on BR2_USE_MMU # glib2
|
||||
depends on !BR2_STATIC_LIBS # gnutls
|
||||
select BR2_PACKAGE_GNUTLS
|
||||
select BR2_PACKAGE_LIBGLIB2
|
||||
help
|
||||
Network-related GIO modules for glib.
|
||||
|
||||
comment "glib-networking needs a toolchain w/ wchar, threads, dynamic library"
|
||||
comment "glib-networking needs a toolchain w/ wchar, threads"
|
||||
depends on BR2_USE_MMU
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
|
||||
depends on !BR2_USE_WCHAR || !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.58/glib-networking-2.58.0.sha256sum
|
||||
sha256 bdfa0255e031b8ee003cc283002536b77ee76450105f1dc6ab066b9bf4330068 glib-networking-2.58.0.tar.xz
|
||||
# From http://ftp.gnome.org/pub/gnome/sources/glib-networking/2.61/glib-networking-2.61.1.sha256sum
|
||||
sha256 a3acbe8953ba80e408bdc4a3e8c240fd9447181c7e800a175c3105604c38bad5 glib-networking-2.61.1.tar.xz
|
||||
sha256 dc626520dcd53a22f727af3ee42c770e56c97a64fe3adb063799d8ab032fe551 COPYING
|
||||
|
|
|
@ -4,25 +4,37 @@
|
|||
#
|
||||
################################################################################
|
||||
|
||||
GLIB_NETWORKING_VERSION_MAJOR = 2.58
|
||||
GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).0
|
||||
GLIB_NETWORKING_VERSION_MAJOR = 2.61
|
||||
GLIB_NETWORKING_VERSION = $(GLIB_NETWORKING_VERSION_MAJOR).1
|
||||
GLIB_NETWORKING_SITE = http://ftp.gnome.org/pub/gnome/sources/glib-networking/$(GLIB_NETWORKING_VERSION_MAJOR)
|
||||
GLIB_NETWORKING_SOURCE = glib-networking-$(GLIB_NETWORKING_VERSION).tar.xz
|
||||
GLIB_NETWORKING_INSTALL_STAGING = YES
|
||||
GLIB_NETWORKING_DEPENDENCIES = \
|
||||
$(TARGET_NLS_DEPENDENCIES) \
|
||||
host-pkgconf \
|
||||
libglib2 \
|
||||
gnutls
|
||||
libglib2
|
||||
|
||||
GLIB_NETWORKING_CONF_OPTS = \
|
||||
-Dlibproxy_support=false \
|
||||
-Dgnome_proxy_support=false \
|
||||
-Dpkcs11_support=false
|
||||
-Dlibproxy=disabled \
|
||||
-Dgnome_proxy=disabled
|
||||
|
||||
GLIB_NETWORKING_LICENSE = LGPL-2.0+
|
||||
GLIB_NETWORKING_LICENSE_FILES = COPYING
|
||||
GLIB_NETWORKING_INSTALL_TARGET_OPTS = DESTDIR=$(TARGET_DIR) \
|
||||
GIO_MODULE_DIR=/usr/lib/gio/modules install
|
||||
|
||||
ifeq ($(BR2_PACKAGE_GNUTLS),y)
|
||||
GLIB_NETWORKING_DEPENDENCIES += gnutls
|
||||
GLIB_NETWORKING_CONF_OPTS += -Dgnutls=enabled
|
||||
else
|
||||
GLIB_NETWORKING_CONF_OPTS += -Dgnutls=disabled
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_OPENSSL),y)
|
||||
GLIB_NETWORKING_DEPENDENCIES += openssl
|
||||
GLIB_NETWORKING_CONF_OPTS += -Dopenssl=enabled
|
||||
else
|
||||
GLIB_NETWORKING_CONF_OPTS += -Dopenssl=disabled
|
||||
endif
|
||||
|
||||
$(eval $(meson-package))
|
||||
|
|
Loading…
Reference in a new issue