From patchwork Wed Jun 26 18:49:40 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carsten Schoenert X-Patchwork-Id: 254837 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 449E02C008E for ; Thu, 27 Jun 2013 04:50:19 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id ECAD031829; Wed, 26 Jun 2013 18:50:17 +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 sIPZiWV8PYFq; Wed, 26 Jun 2013 18:50:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id AE02931AD3; Wed, 26 Jun 2013 18:50: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 D21B58F74B for ; Wed, 26 Jun 2013 18:50:19 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B79958BD1C for ; Wed, 26 Jun 2013 18:50: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 opE2G5edoTPv for ; Wed, 26 Jun 2013 18:49:59 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail-bk0-f53.google.com (mail-bk0-f53.google.com [209.85.214.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id 585238BCDC for ; Wed, 26 Jun 2013 18:49:48 +0000 (UTC) Received: by mail-bk0-f53.google.com with SMTP id e11so5053358bkh.40 for ; Wed, 26 Jun 2013 11:49:46 -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=DEw4R9nHa4YBDb0Y3VR1elidQMP7MrNklmMja+m9tU0=; b=wpzFzj609lcT/zwkIiQnFmZs3/K5kwvAxcNKKh/BiiPG6yFsqwru9nEIFWbom3Gy0/ G40uzliUf3Q46zb26zXUGOc1NsjTn5KkYCvO09LvyHn6PgiL5psCe57ewdMZodT/3MaQ d392tEwO/ZzLvbG2FUVLWnFm/YZdHdpLnrH+S9obC69EdtkaqGJo/2MxRSL4j0isGIeh drpbYrX9czcdDx5hN1zK4W/HnjamOQWJlw+7qvm/WGfIJaxqSu3d5wTmUM0DIiEFMLbj 48FZUgWXNjtwn6oj9DJ2oqt+wswZVorPDfN+Pz6ufrpTMJSxNqnGm8EKcZRtcKR0cpiO BVXA== X-Received: by 10.204.239.132 with SMTP id kw4mr725331bkb.39.1372272585967; Wed, 26 Jun 2013 11:49:45 -0700 (PDT) Received: from localhost.localdomain (p5B37BA47.dip0.t-ipconnect.de. [91.55.186.71]) by mx.google.com with ESMTPSA id if11sm9470169bkc.15.2013.06.26.11.49.44 for (version=TLSv1.2 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 26 Jun 2013 11:49:45 -0700 (PDT) From: Carsten Schoenert To: buildroot@busybox.net Date: Wed, 26 Jun 2013 20:49:40 +0200 Message-Id: <1372272580-26574-1-git-send-email-c.schoenert@gmail.com> X-Mailer: git-send-email 1.7.10.4 Subject: [Buildroot] [PATCH v3] 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 --- Changes in v3: - change implementation of the licenses and correct LGPLv2.1+ version as Arnout argumented Changes in v2: - reworking 'Config.in' after suggestions from Thomas Petazzoni - fixed LIBDVBSI_SITE for correct download URL mentioned by Yann Morin 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..066074a 100644 --- a/package/libmicrohttpd/libmicrohttpd.mk +++ b/package/libmicrohttpd/libmicrohttpd.mk @@ -6,13 +6,16 @@ LIBMICROHTTPD_VERSION = 0.9.27 LIBMICROHTTPD_SITE = $(BR2_GNU_MIRROR)/libmicrohttpd +LIBMICROHTTPD_LICENSE_FILE = COPYING LIBMICROHTTPD_INSTALL_STAGING = YES ifeq ($(BR2_PACKAGE_LIBMICROHTTPD_SSL),y) +LIBMICROHTTPD_LICENSE = LGPLv2.1+ 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 else +LIBMICROHTTPD_LICENSE = LGPLv2.1+ or eCos LIBMICROHTTPD_CONF_OPT += --disable-https endif