From patchwork Mon Jul 23 18:17:13 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Fabrice Fontaine X-Patchwork-Id: 947934 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.137; helo=fraxinus.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KSX3CI+R"; dkim-atps=neutral Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 41Z8q81CBFz9s0R for ; Tue, 24 Jul 2018 04:17:39 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8943C86282; Mon, 23 Jul 2018 18:17:36 +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 QTnsu6hrvZvj; Mon, 23 Jul 2018 18:17:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 288358625B; Mon, 23 Jul 2018 18:17:33 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 627141C3EC6 for ; Mon, 23 Jul 2018 18:17:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 600FC8733E for ; Mon, 23 Jul 2018 18:17:31 +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 ZA1uIUqFeTUA for ; Mon, 23 Jul 2018 18:17:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by whitealder.osuosl.org (Postfix) with ESMTPS id 76003872DD for ; Mon, 23 Jul 2018 18:17:29 +0000 (UTC) Received: by mail-wr1-f66.google.com with SMTP id t13-v6so1605776wrv.12 for ; Mon, 23 Jul 2018 11:17:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=4eVYdQ2uAEUsL1UiUDhK9qdo+bigbgb+ac3S7y40xEs=; b=KSX3CI+RWFqCtdAAQWZfIYeieejjThdv8c7GAlXpRHMp+hae30d7NonPC1ORhBiyPQ GRoRtrIiOc8Zdfr5ddF2VMXoqovDM0RKGDiA0RYhQau7t8WlMd8mtvkaeusPrUWI8E6f ambDd1Ow6M4Z8XwNxaAQcpcya3HIYrYjeq5XgwBhFs4Fdka4Hm/4jG/IsWpmq5zWp7Yi UJ69YpwDYtWrtt+ei9zKZol/rkjTmPRz1tNkHoDs01nxA/I80pVXnVDmw9/8BU6/5jLw BdmwHgt+bB5Gt/vjUTZNE5FP39jV/dVI6NiK+j3o+7AE8N/1M75+Ncx038tJK3RfXdod Ue/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=4eVYdQ2uAEUsL1UiUDhK9qdo+bigbgb+ac3S7y40xEs=; b=OUXoxrW3M8iaSZiZq1VV9D5kd/5wmDtFwyjQR+jTQR2SzQ7owwajosxqHWXgD+TqsX iC16Ef+tgJoj3VMh6WmUtdWpGCVPkR/Svmdg6uNKO6GZCqM4fnsDtGxh+oQ5bzWMqN17 S4BKSYBD1TF3uaZEd9RaMjW81KVabxN2xIn3fyQbDFMSMeP7qX1nAAEubNWmunTCkn9G qTCJTdZ496u9ed84lsrFwB7q+58Nu2YSqu8H0PsIHg9BjmzEShqwDbFlgwHj60PpitSi ZJYFoGAOEwal54n9FGQm+BLrnybdXppGvO1kFJtORLh+ygshMEU8r3t0UuFm0X94ALYk rvKA== X-Gm-Message-State: AOUpUlEoVmFg8VNKnTqdIhELfzz8WOCpRyKyo55IJP40xYJVszA98P1C ezA5+E97mRmjAsu/AX9far1Fx3CS X-Google-Smtp-Source: AAOMgpcTF0xOs4U3iJA3iDb9vfdM+kDLWWrfShA93JeUO5WX2EFTrTASO13o0Z78Fuo6cYmHLGgDnQ== X-Received: by 2002:a5d:4cc5:: with SMTP id c5-v6mr9815865wrt.210.1532369847690; Mon, 23 Jul 2018 11:17:27 -0700 (PDT) Received: from fabrice-VirtualBox.home (ARennes-656-1-404-103.w90-32.abo.wanadoo.fr. [90.32.216.103]) by smtp.gmail.com with ESMTPSA id i125-v6sm17056186wmd.11.2018.07.23.11.17.26 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 23 Jul 2018 11:17:27 -0700 (PDT) From: Fabrice Fontaine To: buildroot@buildroot.org Date: Mon, 23 Jul 2018 20:17:13 +0200 Message-Id: <20180723181713.18954-2-fontaine.fabrice@gmail.com> X-Mailer: git-send-email 2.14.1 In-Reply-To: <20180723181713.18954-1-fontaine.fabrice@gmail.com> References: <20180723181713.18954-1-fontaine.fabrice@gmail.com> Subject: [Buildroot] [PATCH 2/2] mutt: add libidn2 support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.24 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Fabrice Fontaine MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" libidn2 support was added in version 1.10: http://www.mutt.org/relnotes/1.10 libidn and libidn2 can't be selected at the same time: see configure.ac Signed-off-by: Fabrice Fontaine --- package/mutt/mutt.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/package/mutt/mutt.mk b/package/mutt/mutt.mk index 1a2c5342d7..1c3021ece1 100644 --- a/package/mutt/mutt.mk +++ b/package/mutt/mutt.mk @@ -16,11 +16,15 @@ MUTT_DEPENDENCIES += libiconv MUTT_CONF_OPTS += --enable-iconv endif -ifeq ($(BR2_PACKAGE_LIBIDN),y) +# Both options can't be selected at the same time so prefer libidn2 +ifeq ($(BR2_PACKAGE_LIBIDN2),y) +MUTT_DEPENDENCIES += libidn2 +MUTT_CONF_OPTS += --with-idn2 --without-idn +else ifeq ($(BR2_PACKAGE_LIBIDN),y) MUTT_DEPENDENCIES += libidn -MUTT_CONF_OPTS += --with-idn +MUTT_CONF_OPTS += --with-idn --without-idn2 else -MUTT_CONF_OPTS += --without-idn +MUTT_CONF_OPTS += --without-idn --without-idn2 endif ifeq ($(BR2_PACKAGE_MUTT_IMAP),y)