From patchwork Fri Dec 30 10:29:50 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 709758 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3tqjXC2Q9cz9s2G for ; Fri, 30 Dec 2016 21:34:51 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="dnKw+oEX"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 8C9D08277B; Fri, 30 Dec 2016 10:34:49 +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 4wVoNBhAZR3H; Fri, 30 Dec 2016 10:34:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id DCBF385A1C; Fri, 30 Dec 2016 10:32:41 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 68FE31C209D for ; Fri, 30 Dec 2016 10:30:53 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 64F5F86BCB for ; Fri, 30 Dec 2016 10:30: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 bju1jgEwwa7Q for ; Fri, 30 Dec 2016 10:30:52 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wm0-f68.google.com (mail-wm0-f68.google.com [74.125.82.68]) by hemlock.osuosl.org (Postfix) with ESMTPS id 02A22857CF for ; Fri, 30 Dec 2016 10:30:52 +0000 (UTC) Received: by mail-wm0-f68.google.com with SMTP id u144so70266544wmu.0 for ; Fri, 30 Dec 2016 02:30:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=C303ADnJ2wTU932WzfF8KqAgxqD7Pv7iS1O3Yi6GcKk=; b=dnKw+oEX6dSng+Df+v3Utqw2s70wsvLjzX8stJQLlr6vqrPSeYkRMFzEwaBObXfxIr RKH3Df2rtrXV0Cxo7hrdgOkTsg9QAAZrHs59luHlgnZn8GiA3thOUYclzsw8yHfxFLUs 3IY6oZrGDKeF7dIwpX8wmo7m7LK4Q18kez+fV+DEDIATKVZZeCAMgMTmYCXYFL/37A7H eoEF6vWIYUDyffDXlGfUWGiXex8QfsRnDJvFQ/QcWoBAZvyP7+5yPpChdoTg/izsEpgT FNTbrXQCJTs6ca78TnZ4FBQ7OYuhs/X9if6k1Sml6aq7m3wALfrJhCsf3p/D6P6bCK/r IqZg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=C303ADnJ2wTU932WzfF8KqAgxqD7Pv7iS1O3Yi6GcKk=; b=XAvnORRfDfrPaEuKFN1s4X2SVJWAEjx3ccujEUeQgWisCDjnzQt0nmAsgYwUaVGTge pozmHsQVPAOxx5aSnwTbEXQCaCzfKJnu+YACodkTP6C6+dBN/V7kLQJEubZHuruoWj/p rcsb2AfMTp/C7JfkFM2+KFGi5F1WRptrZpfVxRZrBExryEaKGB4JV2eGImnf32C3iDFa XM1o3vwi7iQJlTvDj01bdA8sUW8XONi9knACH1edhF2RAm2SiBxdLN2F+1b4o8DftPBE U/565uK4NwrRCiAjVoBmlkuABpxa/0n+PMv9phD07XCh+nyHMzeGD/BjIs/IJLD/2GE4 vflg== X-Gm-Message-State: AIkVDXIF4VBmnYsbQl1MuaRPCTfN69JnLJe9VYzJZ0r/hguLMPdvWWsRxg/lCD26XqAZsQ== X-Received: by 10.28.8.12 with SMTP id 12mr38197516wmi.46.1483093850369; Fri, 30 Dec 2016 02:30:50 -0800 (PST) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id p144sm69904809wme.23.2016.12.30.02.30.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Fri, 30 Dec 2016 02:30:49 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Fri, 30 Dec 2016 11:29:50 +0100 Message-Id: <9e2dc3a55439562ac253227770c587eef4773732.1483093662.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Cc: "Yann E. MORIN" Subject: [Buildroot] [PATCH 49/52] package/asterisk: add optional iconv support X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 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" iconv support is available if iether the toolchain has iconv built-in (glibc, musl, or uclibc-with-iconv) or if the libiconv package is enabled. Both are exclusive one to the other, so we need only test one. Signed-off-by: "Yann E. MORIN" --- package/asterisk/asterisk.mk | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/package/asterisk/asterisk.mk b/package/asterisk/asterisk.mk index dee60c0..d9bdb5b 100644 --- a/package/asterisk/asterisk.mk +++ b/package/asterisk/asterisk.mk @@ -36,7 +36,6 @@ ASTERISK_CONF_OPTS += \ --without-gmime \ --without-h323 \ --without-hoard \ - --without-iconv \ --without-iksemel \ --without-imap \ --without-inotify \ @@ -131,6 +130,13 @@ else ASTERISK_CONF_OPTS += --without-ilbc endif +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y) +ASTERISK_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) +ASTERISK_CONF_OPTS += --with-iconv +else +ASTERISK_CONF_OPTS += --without-iconv +endif + ifeq ($(BR2_PACKAGE_OPENLDAP),y) ASTERISK_DEPENDENCIES += openldap ASTERISK_CONF_OPTS += --without-ldap