From patchwork Tue Sep 3 10:37:56 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 272197 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id E3EE62C00BB for ; Tue, 3 Sep 2013 20:38:16 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 0CAF78A94A; Tue, 3 Sep 2013 10:38:15 +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 qviI9BmTptD2; Tue, 3 Sep 2013 10:38:14 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1C56A8A8AD; Tue, 3 Sep 2013 10:38:14 +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 033EB1CE5A4 for ; Tue, 3 Sep 2013 10:38:13 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id EE1A08A8AD for ; Tue, 3 Sep 2013 10:38:12 +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 0+-4rgwMllZc for ; Tue, 3 Sep 2013 10:38:11 +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 A5DE2865F0 for ; Tue, 3 Sep 2013 10:38:10 +0000 (UTC) Received: from asgard (host126.190-136-121.telecom.net.ar [190.136.121.126]) (authenticated bits=0) by loknar.toptech.com.ar (8.14.7/8.14.7) with ESMTP id r83Ac3kX010580 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 3 Sep 2013 10:38:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1378204687; bh=gIDqI3b9G2Ea2ZTc8ZeZHu3xex9GQA6jl5ovEybwKW8=; h=From:To:Cc:Subject:Date; b=QJ2uu75fdX+a4N2Tmls0za+YGGY4JiQac4U6vBjdA3s2jNJiJDFYuJupHasb4Nzhc 3NU77vgHbpL6IFmoG9prRJCHkAq92ZYzFU4LIXOcsOhEQUc6mmccrY9GKgX5jwl8cZ JInWo4msgC13OyGt8tHrgC7NAEJu+PcPqFUSiNMg= Received: by asgard (sSMTP sendmail emulation); Tue, 03 Sep 2013 07:37:57 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Tue, 3 Sep 2013 07:37:56 -0300 Message-Id: <1378204676-21152-1-git-send-email-gustavo@zacarias.com.ar> X-Mailer: git-send-email 1.8.1.5 X-Virus-Scanned: clamav-milter 0.97.7 at loknar X-Virus-Status: Clean Subject: [Buildroot] [PATCH] libcurl: extend package support 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 Add support for gnutls, nss and polarssl backends. Add support for libidn and zlib. Signed-off-by: Gustavo Zacarias --- package/libcurl/libcurl.mk | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/package/libcurl/libcurl.mk b/package/libcurl/libcurl.mk index d5012b6..71f19f1 100644 --- a/package/libcurl/libcurl.mk +++ b/package/libcurl/libcurl.mk @@ -7,6 +7,9 @@ LIBCURL_VERSION = 7.32.0 LIBCURL_SOURCE = curl-$(LIBCURL_VERSION).tar.bz2 LIBCURL_SITE = http://curl.haxx.se/download +LIBCURL_DEPENDENCIES = host-pkgconf \ + $(if $(BR2_PACKAGE_ZLIB),zlib) \ + $(if $(BR2_PACKAGE_LIBIDN),libidn) LIBCURL_LICENSE = ICS LIBCURL_LICENSE_FILES = COPYING LIBCURL_INSTALL_STAGING = YES @@ -15,8 +18,8 @@ LIBCURL_INSTALL_STAGING = YES # on non-MMU platforms. Moreover, this authentication method is # probably almost never used. See # http://curl.haxx.se/docs/manpage.html#--ntlm. -LIBCURL_CONF_OPT = --disable-verbose --disable-manual \ - --enable-hidden-symbols --disable-ntlm-wb +LIBCURL_CONF_OPT = --disable-verbose --disable-manual --disable-ntlm-wb \ + --enable-hidden-symbols --with-random=/dev/urandom LIBCURL_CONFIG_SCRIPTS = curl-config ifeq ($(BR2_PACKAGE_OPENSSL),y) @@ -27,11 +30,21 @@ LIBCURL_CONF_ENV += ac_cv_lib_crypto_CRYPTO_lock=yes # Fix it by setting LD_LIBRARY_PATH to something sensible so those libs # are found first. LIBCURL_CONF_ENV += LD_LIBRARY_PATH=$$LD_LIBRARY_PATH:/lib:/usr/lib -LIBCURL_CONF_OPT += --with-ssl \ - --with-random=/dev/urandom \ +LIBCURL_CONF_OPT += --with-ssl=$(STAGING_DIR)/usr \ --with-ca-path=/etc/ssl/certs +else ifeq ($(BR2_PACKAGE_GNUTLS),y) +LIBCURL_CONF_OPT += --with-gnutls=$(STAGING_DIR)/usr +LIBCURL_DEPENDENCIES += gnutls +else ifeq ($(BR2_PACKAGE_POLARSSL),y) +LIBCURL_CONF_OPT += --with-polarssl=$(STAGING_DIR)/usr +LIBCURL_DEPENDENCIES += polarssl +else ifeq ($(BR2_PACKAGE_LIBNSS),y) +LIBCURL_CONF_OPT += --with-nss=$(STAGING_DIR)/usr +LIBCURL_CONF_ENV += CPPFLAGS="$(TARGET_CPPFLAGS) `$(PKG_CONFIG_HOST_BINARY) nspr nss --cflags`" +LIBCURL_DEPENDENCIES += libnss else -LIBCURL_CONF_OPT += --without-ssl +LIBCURL_CONF_OPT += --without-ssl --without-gnutls \ + --without-polarssl --without-nss endif define LIBCURL_FIX_DOT_PC