mirrors/buildroot
0
0
Fork 0
mirror of https://git.busybox.net/buildroot.git synced 2024-11-27 15:33:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

gnutls: drop wchar dependency

Browse Source 
Commit 19448f40a0 (gnutls: use included unistring unless libunistring is
selected) made libunistring an optional dependency.  So now gnutls no longer
depend on wchar.

Drop wchar dependency of libmicrohttpd and libsoup, which are gnutls
reverse dependencies that do not depend themselves on wchar.

Update the comments in libsoup and taskd; the wchar dependency is now
not due to gnutls.

Cc: Matt Weber <matthew.weber@rockwellcollins.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
This commit is contained in:
Baruch Siach 2018-06-22 08:38:41 +03:00 committed by Peter Korsgaard
parent c67889623e
commit 694cdb9273
5 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
package/gnutls/Config.in
View File

@ -2,7 +2,6 @@ config BR2_PACKAGE_GNUTLS
bool "gnutls"
# https://gitlab.com/gnutls/gnutls/issues/203
depends on !BR2_STATIC_LIBS
depends on BR2_USE_WCHAR
select BR2_PACKAGE_LIBTASN1
select BR2_PACKAGE_NETTLE
select BR2_PACKAGE_PCRE
@ -24,5 +23,5 @@ config BR2_PACKAGE_GNUTLS_TOOLS
endif
comment "gnutls needs a toolchain w/ wchar, dynamic library"
depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
comment "gnutls needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS

5
package/libmicrohttpd/Config.in
View File

@ -12,13 +12,12 @@ if BR2_PACKAGE_LIBMICROHTTPD
config BR2_PACKAGE_LIBMICROHTTPD_SSL
bool "https support"
depends on !BR2_STATIC_LIBS # gnutls
depends on BR2_USE_WCHAR
select BR2_PACKAGE_GNUTLS
help
Enable HTTPS (SSL) support.
comment "libmicrohttpd https support needs a toolchain w/ wchar, dynamic library"
depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
comment "libmicrohttpd https support needs a toolchain w/ dynamic library"
depends on BR2_STATIC_LIBS
endif

2
package/libsoup/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBSOUP
bool "libsoup"
depends on BR2_USE_WCHAR # glib2 and gnutls
depends on BR2_USE_WCHAR # glib2
depends on BR2_TOOLCHAIN_HAS_THREADS # glib2
depends on BR2_USE_MMU # glib2
select BR2_PACKAGE_LIBXML2

2
package/taskd/Config.in
View File

@ -1,7 +1,7 @@
config BR2_PACKAGE_TASKD
bool "taskd"
depends on !BR2_STATIC_LIBS # gnutls
depends on BR2_USE_WCHAR # gnutls
depends on BR2_USE_WCHAR
depends on BR2_USE_MMU # fork()
depends on BR2_INSTALL_LIBSTDCPP
select BR2_PACKAGE_GNUTLS

5
package/vpnc/Config.in
View File

@ -3,7 +3,6 @@ config BR2_PACKAGE_VPNC
depends on BR2_PACKAGE_LIBGPG_ERROR_ARCH_SUPPORTS # libgcrypt
depends on !BR2_STATIC_LIBS # gnutls
depends on BR2_USE_MMU # fork()
depends on BR2_USE_WCHAR # gnutls
select BR2_PACKAGE_LIBGCRYPT
select BR2_PACKAGE_LIBGPG_ERROR
select BR2_PACKAGE_GNUTLS
@ -16,6 +15,6 @@ config BR2_PACKAGE_VPNC
http://www.unix-ag.uni-kl.de/~massar/vpnc
comment "vpnc needs a toolchain w/ wchar, dynamic library"
comment "vpnc needs a toolchain w/ dynamic library"
depends on BR2_USE_MMU
depends on !BR2_USE_WCHAR || BR2_STATIC_LIBS
depends on BR2_STATIC_LIBS