From patchwork Wed Dec 26 13:55:48 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 208173 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 8402B2C00BF for ; Thu, 27 Dec 2012 00:56:14 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 2E161100AEF; Wed, 26 Dec 2012 13:56:04 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 3t1OoISUEBpD; Wed, 26 Dec 2012 13:55:59 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id BEF3CFFBB0; Wed, 26 Dec 2012 13:55:58 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 9237B8F74B for ; Wed, 26 Dec 2012 13:56:11 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D3D8D8681C for ; Wed, 26 Dec 2012 13:56:05 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id dtMGucsGowup for ; Wed, 26 Dec 2012 13:56:04 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from loknar.toptech.com.ar (loknar.toptech.com.ar [78.46.79.162]) by whitealder.osuosl.org (Postfix) with ESMTPS id 87B7E8621E for ; Wed, 26 Dec 2012 13:56:04 +0000 (UTC) Received: from asgard (host204.190-231-107.telecom.net.ar [190.231.107.204]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.5/8.14.5) with ESMTP id qBQDtvQ0001013 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 26 Dec 2012 13:56:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1356530162; bh=cU7PA2ookjb/ZdQOSLnNEt97kxN287M65OWrRpRabHo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=pHaVfz/7w9ze18G1LJ7Xb6T+IZZaDDsOJAHJ1foeT6alL8UKhATTl/mkrfrQ31bX9 2UmpJueISLxZcnjM9G/GL2Zj82HhCzqjZ+33UKVT5xovSBQQ1+znPQ16St0lBkxMZW QoutD6PmeXy8q2OQJ8fEnLaGh3tP+1OR4RSTxbMM= Received: by asgard (sSMTP sendmail emulation); Wed, 26 Dec 2012 10:55:56 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 26 Dec 2012 10:55:48 -0300 Message-Id: <1356530149-12305-2-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.7.8.6 In-Reply-To: <1356530149-12305-1-git-send-email-gustavo@zacarias.com.ar> References: <1356530149-12305-1-git-send-email-gustavo@zacarias.com.ar> X-Virus-Scanned: clamav-milter 0.97.5 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH 2/3] gnutls: make it non-wchar friendly X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.14 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: buildroot-bounces@busybox.net Make gnutls work for non-wchar toolchains. It's just a matter of throwing a helping hand to configure. Signed-off-by: Gustavo Zacarias --- package/connman/Config.in | 2 +- package/gnutls/Config.in | 4 ---- package/gnutls/gnutls.mk | 5 ++++- package/libsoup/Config.in | 2 +- package/network-manager/Config.in | 2 +- 5 files changed, 7 insertions(+), 8 deletions(-) diff --git a/package/connman/Config.in b/package/connman/Config.in index 93f9ab5..4c9741b 100644 --- a/package/connman/Config.in +++ b/package/connman/Config.in @@ -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 diff --git a/package/gnutls/Config.in b/package/gnutls/Config.in index 556caea..cedf120 100644 --- a/package/gnutls/Config.in +++ b/package/gnutls/Config.in @@ -1,12 +1,8 @@ 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 diff --git a/package/gnutls/gnutls.mk b/package/gnutls/gnutls.mk index 2634642..506d7f5 100644 --- a/package/gnutls/gnutls.mk +++ b/package/gnutls/gnutls.mk @@ -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 diff --git a/package/libsoup/Config.in b/package/libsoup/Config.in index 57b425f..c3b4ceb 100644 --- a/package/libsoup/Config.in +++ b/package/libsoup/Config.in @@ -1,6 +1,6 @@ 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 diff --git a/package/network-manager/Config.in b/package/network-manager/Config.in index e2324d6..f2544da 100644 --- a/package/network-manager/Config.in +++ b/package/network-manager/Config.in @@ -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