From patchwork Wed Dec 26 13:55:49 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 208174 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 9E7352C00BF for ; Thu, 27 Dec 2012 00:56:21 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 4786F100BF8; Wed, 26 Dec 2012 13:56:11 +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 wt-80LIft1tN; Wed, 26 Dec 2012 13:56:04 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 09876100842; Wed, 26 Dec 2012 13:56:04 +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 CDFD28F74B for ; Wed, 26 Dec 2012 13:56:16 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 126A28681C for ; Wed, 26 Dec 2012 13:56:11 +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 RRCki-Qkzu5J for ; Wed, 26 Dec 2012 13:56:10 +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 202138621E for ; Wed, 26 Dec 2012 13:56:09 +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 qBQDu32n001019 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 26 Dec 2012 13:56:05 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1356530167; bh=mlA+xXsHbfvz5iMLwTNLD1gd+v45B9f6W288SiW+nfo=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=XLHFSs72PoLkoEG499oqXm4VOIYdGKb0kQWEp3ciJ81iZtk+0LIKz36urlel6w0dF U+/ok3cDprNrFzKTmkaTbzokOFb6mGPKFFJ7Sf8XwI0NzxHGlEhakAE/ZmQGhODfdf lv0K8QvFFFdeamRvy506ricDN3HBXdVRRcMR/N1U= Received: by asgard (sSMTP sendmail emulation); Wed, 26 Dec 2012 10:56:02 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Wed, 26 Dec 2012 10:55:49 -0300 Message-Id: <1356530149-12305-3-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 3/3] libmicrohttpd: bump to version 0.9.24 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 Signed-off-by: Gustavo Zacarias --- package/libmicrohttpd/Config.in | 5 +++++ package/libmicrohttpd/libmicrohttpd.mk | 8 ++++---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in index cfedc8f..4e78a99 100644 --- a/package/libmicrohttpd/Config.in +++ b/package/libmicrohttpd/Config.in @@ -1,5 +1,6 @@ config BR2_PACKAGE_LIBMICROHTTPD bool "libmicrohttpd" + depends on BR2_TOOLCHAIN_HAS_THREADS help GNU libmicrohttpd is a small C library that makes it easy to run an HTTP server as part of another application. @@ -9,6 +10,10 @@ config BR2_PACKAGE_LIBMICROHTTPD config BR2_PACKAGE_LIBMICROHTTPD_SSL bool "https support" depends on BR2_PACKAGE_LIBMICROHTTPD + select BR2_PACKAGE_GNUTLS select BR2_PACKAGE_LIBGCRYPT help Enable HTTPS (SSL) support. + +comment "libmicrohttpd needs a toolchain with thread support" + depends on !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index f8690ee..cf84b2d 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -3,14 +3,14 @@ # libmicrohttpd # ############################################################# -LIBMICROHTTPD_VERSION = 0.4.6 -LIBMICROHTTPD_SOURCE = libmicrohttpd-$(LIBMICROHTTPD_VERSION).tar.gz + +LIBMICROHTTPD_VERSION = 0.9.24 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) -LIBMICROHTTPD_DEPENDENCIES += libgcrypt -LIBMICROHTTPD_CONF_OPT += --enable-https \ +LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt +LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \ --with-libgcrypt-prefix=$(STAGING_DIR)/usr else LIBMICROHTTPD_CONF_OPT += --disable-https