Commit f1b86cef authored by Gustavo Zacarias's avatar Gustavo Zacarias Committed by Peter Korsgaard
Browse files

gnutls: make it non-wchar friendly 



Make gnutls work for non-wchar toolchains.
It's just a matter of throwing a helping hand to configure.

Signed-off-by: default avatarGustavo Zacarias <gustavo@zacarias.com.ar>
Signed-off-by: default avatarPeter Korsgaard <jacmet@sunsite.dk>
parent a12f6402

package/connman/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ config BR2_PACKAGE_CONNMAN 
	select BR2_PACKAGE_IPTABLES

	select BR2_PACKAGE_GNUTLS

	depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)

	depends on BR2_USE_WCHAR # libglib2 and gnutls

	depends on BR2_USE_WCHAR # libglib2

	depends on BR2_INET_IPV6

	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus

	depends on BR2_USE_MMU # dbus

package/gnutls/Config.in

+0 −4
Original line number Diff line number Diff line 
config BR2_PACKAGE_GNUTLS

	bool "gnutls"

	select BR2_PACKAGE_LIBGCRYPT

	depends on BR2_USE_WCHAR

	help

	  GnuTLS is a secure communications library implementing the SSL

	  and TLS protocols and technologies around them.



	  http://www.gnu.org/software/gnutls/gnutls.html
 


comment "gnutls requires a toolchain with WCHAR support"

	depends on !BR2_USE_WCHAR

package/gnutls/gnutls.mk

+4 −1
Original line number Diff line number Diff line
@@ -10,7 +10,10 @@ GNUTLS_SITE = $(BR2_GNU_MIRROR)/gnutls 
GNUTLS_LICENSE = GPLv3+ LGPLv2.1+

GNUTLS_LICENSE_FILES = COPYING lib/COPYING

GNUTLS_DEPENDENCIES = host-pkgconf libgcrypt $(if $(BR2_PACKAGE_ZLIB),zlib)

GNUTLS_CONF_ENV = acl_cv_rpath=no

GNUTLS_CONF_ENV = acl_cv_rpath=no \

	ac_cv_header_wchar_h=$(if $(BR2_USE_WCHAR),yes,no) \

	gt_cv_c_wchar_t=$(if $(BR2_USE_WCHAR),yes,no) \

	gt_cv_c_wint_t=$(if $(BR2_USE_WCHAR),yes,no)

GNUTLS_CONF_OPT = --with-libgcrypt --without-libgcrypt-prefix \

		--without-p11-kit --disable-rpath

GNUTLS_INSTALL_STAGING = YES

package/libsoup/Config.in

+1 −1
Original line number Diff line number Diff line 
config BR2_PACKAGE_LIBSOUP

	bool "libsoup"

	depends on BR2_USE_WCHAR # glib2 and gnutls

	depends on BR2_USE_WCHAR # glib2

	select BR2_PACKAGE_LIBXML2

	select BR2_PACKAGE_LIBGLIB2

	select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

package/network-manager/Config.in

+1 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ config BR2_PACKAGE_NETWORK_MANAGER 
	select BR2_PACKAGE_DBUS

	depends on BR2_INET_IPV6

	depends on BR2_LARGEFILE # acl

	depends on BR2_USE_WCHAR # libglib2 and gnutls

	depends on BR2_USE_WCHAR # libglib2

	depends on BR2_TOOLCHAIN_HAS_THREADS # dbus

	depends on BR2_USE_MMU # dbus

	select BR2_PACKAGE_DBUS_GLIB