From patchwork Mon Sep 2 10:19:44 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gustavo Zacarias X-Patchwork-Id: 271860 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ozlabs.org (Postfix) with ESMTP id 73CD82C009C for ; Mon, 2 Sep 2013 20:20:05 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 868FE93326; Mon, 2 Sep 2013 10:20:53 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id n-qihgcuAx8j; Mon, 2 Sep 2013 10:20:49 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A3E6B932F8; Mon, 2 Sep 2013 10:20:49 +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 79D861C1766 for ; Mon, 2 Sep 2013 10:19:59 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 73CEA8AF6F for ; Mon, 2 Sep 2013 10:19:59 +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 Vx9e-RlI1hsp for ; Mon, 2 Sep 2013 10:19:58 +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 D34D38AF64 for ; Mon, 2 Sep 2013 10:19:57 +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 r82AJoQu001188 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Mon, 2 Sep 2013 10:19:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=zacarias.com.ar; s=dkey; t=1378117195; bh=V0tDfqnXSodGu0RdaRYro9ytnKdpDaccI5CGZ/NMafE=; h=From:To:Cc:Subject:Date; b=sjrFIEfU+FVdTRVcYd/nHDDYGVhBVNb5yiCIWmTm73UQARDzGwTFJvmVBNBrCwV7u pPOzF/xALHU+ntugmS2s/sYAzmZdN25T3FTXMGD2eHG4B7gUvtM0TgfsnuZG8VoA+E sngXAGDQTjFncyxJHApNdRbz/tDjrjgkL3u7JftI= Received: by asgard (sSMTP sendmail emulation); Mon, 02 Sep 2013 07:19:44 -0300 From: Gustavo Zacarias To: buildroot@busybox.net Date: Mon, 2 Sep 2013 07:19:44 -0300 Message-Id: <1378117184-7653-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] libmicrohttpd: disable spdy 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 It requires OpenSSL and IPv6 support and it should probably be an option since SSL support uses GnuTLS thus making a huge target footprint with 2 SSL/TLS libraries for full support. But most of all it's considered experimental. Fixes: http://autobuild.buildroot.net/results/836/836c39c11cecbcf9399675ba3ab01202417b9642/ Signed-off-by: Gustavo Zacarias --- .../libmicrohttpd-01-openssl-conditional.patch | 20 ++++++++++++++++++++ package/libmicrohttpd/libmicrohttpd.mk | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch diff --git a/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch b/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch new file mode 100644 index 0000000..37d5e1e --- /dev/null +++ b/package/libmicrohttpd/libmicrohttpd-01-openssl-conditional.patch @@ -0,0 +1,20 @@ +Subject: [PATCH] Fix configure failure for --disable-spdy + +The @HAVE_OPENSSL@ conditional is used in src/Makefile.in so when SPDY +support is forcibly disabled the AM_CONDITIONAL is never executed, causing +configure to bail out. + +Signed-off-by: Gustavo Zacarias + +diff -Nura libmicrohttpd-0.9.29.orig/configure.ac libmicrohttpd-0.9.29/configure.ac +--- libmicrohttpd-0.9.29.orig/configure.ac 2013-09-02 06:17:44.660620584 -0300 ++++ libmicrohttpd-0.9.29/configure.ac 2013-09-02 06:36:44.598189751 -0300 +@@ -341,6 +341,8 @@ + enable_spdy="yes"], + [AM_CONDITIONAL(HAVE_OPENSSL, false) + enable_spdy="no"]) ++else ++ AM_CONDITIONAL(HAVE_OPENSSL, false) + fi + + if test "$enable_spdy" = "yes" diff --git a/package/libmicrohttpd/libmicrohttpd.mk b/package/libmicrohttpd/libmicrohttpd.mk index 31ef7fe..d0501ee 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -8,6 +8,8 @@ LIBMICROHTTPD_VERSION = 0.9.29 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd LIBMICROHTTPD_LICENSE_FILES = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES +LIBMICROHTTPD_CONF_OPT = --disable-spdy +LIBMICROHTTPD_AUTORECONF = YES ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) LIBMICROHTTPD_LICENSE = LGPLv2.1+