jeans/motioneyeos
jeans/motioneyeos
1
0
Fork 0
mirror of https://github.com/motioneye-project/motioneyeos.git synced 2025-07-27 21:26:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gnutls: make it non-wchar friendly"

Browse Source 
This reverts commit f1b86cef9884894df26ed25efaabe254f8f0754b

While the fix makes gnutls build without wchar, it doesn't actually work as
there's no rpl_wctomb implementation so the .so ends up with an undefined
reference to wctomb:

./host/usr/bin/arm-linux-nm -D staging/usr/lib/libgnutls.so.28|grep wctomb
         U wctomb

Causing linker errors for packages trying to use it:

  CCLD   msmtp
host/usr/arm-buildroot-linux-uclibcgnueabi/sysroot/usr/lib/libgnutls.so:
undefined reference to `wctomb'
collect2: ld returned 1 exit status

Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
This commit is contained in:
Peter Korsgaard 2013-02-05 11:45:28 +01:00
parent ab6f23bda0
commit 68c3f5257d
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/connman/Config.in
View File

@ -5,7 +5,7 @@ config BR2_PACKAGE_CONNMAN
select BR2_PACKAGE_IPTABLES select BR2_PACKAGE_IPTABLES
select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_GNUTLS
depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32) depends on !(BR2_UCLIBC_VERSION_0_9_31 || BR2_UCLIBC_VERSION_0_9_32)
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2 and gnutls
depends on BR2_INET_IPV6 depends on BR2_INET_IPV6
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus

6
package/gnutls/Config.in
View File

@ -1,6 +1,7 @@
config BR2_PACKAGE_GNUTLS config BR2_PACKAGE_GNUTLS
bool "gnutls" bool "gnutls"
select BR2_PACKAGE_NETTLE select BR2_PACKAGE_NETTLE
depends on BR2_USE_WCHAR
help help
GnuTLS is a secure communications library implementing the SSL GnuTLS is a secure communications library implementing the SSL
and TLS protocols and technologies around them. and TLS protocols and technologies around them.
@ -9,10 +10,9 @@ config BR2_PACKAGE_GNUTLS
config BR2_PACKAGE_GNUTLS_TOOLS config BR2_PACKAGE_GNUTLS_TOOLS
bool "install tools" bool "install tools"
depends on BR2_PACKAGE_GNUTLS
depends on BR2_USE_WCHAR depends on BR2_USE_WCHAR
help help
Install GnuTLS command line tools for various cryptographic tasks. Install GnuTLS command line tools for various cryptographic tasks.
comment "gnutls tools requires a toolchain with WCHAR support" comment "gnutls requires a toolchain with WCHAR support"
depends on BR2_PACKAGE_GNUTLS && !BR2_USE_WCHAR depends on !BR2_USE_WCHAR

4
package/libmicrohttpd/Config.in
View File

@ -10,6 +10,7 @@ config BR2_PACKAGE_LIBMICROHTTPD
config BR2_PACKAGE_LIBMICROHTTPD_SSL config BR2_PACKAGE_LIBMICROHTTPD_SSL
bool "https support" bool "https support"
depends on BR2_PACKAGE_LIBMICROHTTPD depends on BR2_PACKAGE_LIBMICROHTTPD
depends on BR2_USE_WCHAR
select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_GNUTLS
select BR2_PACKAGE_LIBGCRYPT select BR2_PACKAGE_LIBGCRYPT
help help
@ -17,3 +18,6 @@ config BR2_PACKAGE_LIBMICROHTTPD_SSL
comment "libmicrohttpd needs a toolchain with thread support" comment "libmicrohttpd needs a toolchain with thread support"
depends on !BR2_TOOLCHAIN_HAS_THREADS depends on !BR2_TOOLCHAIN_HAS_THREADS
comment "libmicrohttpd https support needs a toolchain with wchar support"
depends on BR2_PACKAGE_LIBMICROHTTPD && !BR2_USE_WCHAR

2
package/libsoup/Config.in
View File

@ -1,6 +1,6 @@
config BR2_PACKAGE_LIBSOUP config BR2_PACKAGE_LIBSOUP
bool "libsoup" bool "libsoup"
depends on BR2_USE_WCHAR # glib2 depends on BR2_USE_WCHAR # glib2 and gnutls
select BR2_PACKAGE_LIBXML2 select BR2_PACKAGE_LIBXML2
select BR2_PACKAGE_LIBGLIB2 select BR2_PACKAGE_LIBGLIB2
select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT select BR2_PACKAGE_GETTEXT if BR2_NEEDS_GETTEXT

2
package/network-manager/Config.in
View File

@ -4,7 +4,7 @@ config BR2_PACKAGE_NETWORK_MANAGER
select BR2_PACKAGE_DBUS select BR2_PACKAGE_DBUS
depends on BR2_INET_IPV6 depends on BR2_INET_IPV6
depends on BR2_LARGEFILE # acl depends on BR2_LARGEFILE # acl
depends on BR2_USE_WCHAR # libglib2 depends on BR2_USE_WCHAR # libglib2 and gnutls
depends on BR2_TOOLCHAIN_HAS_THREADS # dbus depends on BR2_TOOLCHAIN_HAS_THREADS # dbus
depends on BR2_USE_MMU # dbus depends on BR2_USE_MMU # dbus
select BR2_PACKAGE_DBUS_GLIB select BR2_PACKAGE_DBUS_GLIB