From patchwork Tue Jun 25 19:08:33 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carsten Schoenert X-Patchwork-Id: 254294 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id E42142C0085 for ; Wed, 26 Jun 2013 05:08:48 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 8FB6726DC1; Tue, 25 Jun 2013 19:08:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id epfJ1cUwDITu; Tue, 25 Jun 2013 19:08:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 4E27027021; Tue, 25 Jun 2013 19:08:45 +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 B81708F7A2 for ; Tue, 25 Jun 2013 19:08:50 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8FC9B8BA6E for ; Tue, 25 Jun 2013 19:08:43 +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 CvOMeTr7d647 for ; Tue, 25 Jun 2013 19:08:42 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-ea0-f174.google.com (mail-ea0-f174.google.com [209.85.215.174]) by whitealder.osuosl.org (Postfix) with ESMTPS id B65668B92F for ; Tue, 25 Jun 2013 19:08:41 +0000 (UTC) Received: by mail-ea0-f174.google.com with SMTP id o10so6957802eaj.5 for ; Tue, 25 Jun 2013 12:08:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer; bh=DfVXnM9vt4sCqZ1LwKFXHgpntCRqMFOzpjv/VAQ+vZk=; b=eYtYZZjnKZMBMzq79N5yEg4nnFG7mswO+jPZVM7EJHBKHkDMk5HlghvMq1pIl9ijnd o3EdTK3x2dGQ2DVuee92rwYRpZ0m0lfwqQCYMe/fO5ddx74wzqJeFhLJapVNJH2b7qMC B7C176iITfVp8j4oF6ju3XxxwEsW1nOnIO2lYK8oBFVWihp7/r24lRFGTlN203Oeqj1K J2klYkbVHpD3AGO95TCq+JDHnxAeuFuVNOTLukMp2aRqnD0f54T7Q6dX9QqEverUidtb WUP9qdcDSpwlydMxGQb9vuqOMkWti86XNOjz5uwheL+pI1kd3n7bl0KpXzPSIwQOaoIh 6B0w== X-Received: by 10.14.202.70 with SMTP id c46mr482829eeo.28.1372187319981; Tue, 25 Jun 2013 12:08:39 -0700 (PDT) Received: from localhost.localdomain (p5B37BAEB.dip0.t-ipconnect.de. [91.55.186.235]) by mx.google.com with ESMTPSA id b3sm37999398eev.10.2013.06.25.12.08.38 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 25 Jun 2013 12:08:39 -0700 (PDT) From: Carsten Schoenert To: buildroot@busybox.net Date: Tue, 25 Jun 2013 21:08:33 +0200 Message-Id: <1372187313-15042-1-git-send-email-c.schoenert@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH] package/libmicrohttpd: minor fixes and additions 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 From: Carsten Schoenert Correcting the indentation inside Config.in. Also adding the missed license information. Note: libmicrohttpd is partialy dual licensed, if you don't need or want to use the HTTPS option you can choose between LPGLv2.1 and the eCos license (http://ecos.sourceware.org/license-overview.html). If you use the HTTPS option you have to agree to the LGPLv2.1! Signed-off-by: Carsten Schoenert --- package/libmicrohttpd/Config.in | 14 +++++++------- package/libmicrohttpd/libmicrohttpd.mk | 5 ++++- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package/libmicrohttpd/Config.in b/package/libmicrohttpd/Config.in index 2e4de0f..5c20ba6 100644 --- a/package/libmicrohttpd/Config.in +++ b/package/libmicrohttpd/Config.in @@ -8,13 +8,13 @@ config BR2_PACKAGE_LIBMICROHTTPD http://www.gnu.org/software/libmicrohttpd/ config BR2_PACKAGE_LIBMICROHTTPD_SSL - bool "https support" - depends on BR2_PACKAGE_LIBMICROHTTPD - depends on BR2_USE_WCHAR - select BR2_PACKAGE_GNUTLS - select BR2_PACKAGE_LIBGCRYPT - help - Enable HTTPS (SSL) support. + bool "https support" + depends on BR2_PACKAGE_LIBMICROHTTPD + depends on BR2_USE_WCHAR + 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 697cbf5..40ef197 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -6,12 +6,15 @@ LIBMICROHTTPD_VERSION = 0.9.27 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd +LIBMICROHTTPD_LICENSE = LGPLv2.1 eCos +LIBMICROHTTPD_LICENSE_FILE = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) LIBMICROHTTPD_DEPENDENCIES += gnutls libgcrypt LIBMICROHTTPD_CONF_OPT += --enable-https --with-gnutls=$(STAGING_DIR)/usr \ - --with-libgcrypt-prefix=$(STAGING_DIR)/usr + --with-libgcrypt-prefix=$(STAGING_DIR)/usr +LIBMICROHTTPD_LICENSE = LGPLv2.1 else LIBMICROHTTPD_CONF_OPT += --disable-https endif