From patchwork Wed May 15 10:18:35 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 243965 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (fraxinus.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id 216B82C009C for ; Wed, 15 May 2013 20:18:54 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id C310410BA7E; Wed, 15 May 2013 10:18:32 +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 ZXGA2idZSx0h; Wed, 15 May 2013 10:18:24 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id E3B8410B9AF; Wed, 15 May 2013 10:18:23 +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 3A7BD8F74B for ; Wed, 15 May 2013 10:18:49 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B34BE8D07F for ; Wed, 15 May 2013 10:18:41 +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 BzM-sVXAc8aH for ; Wed, 15 May 2013 10:18:40 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wg0-f53.google.com (mail-wg0-f53.google.com [74.125.82.53]) by whitealder.osuosl.org (Postfix) with ESMTPS id A1B288D090 for ; Wed, 15 May 2013 10:18:39 +0000 (UTC) Received: by mail-wg0-f53.google.com with SMTP id y10so1446730wgg.20 for ; Wed, 15 May 2013 03:18:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:subject:date:message-id:x-mailer; bh=dDsyC22nYl1qamaWt/5mn6YwNN/2VarGFjjMOT0W7wA=; b=IEIvr/21nF9UqPJYNeEWCyXXxw5pjLd9fwFbpB4CXF26E0EF286sFeFdd7OgcnD4an MHB3pAKK3+y8ZW35GfsHAZZFRm+bHDW1jdbT+B49+b9NEa7mOoJM1eMxoSykGHV0pJMN gjtN7zC0BfMziTG5l5ZTVfM74+MrvDfv6Ew0A9QLPteXiVPqP2oCYa+cEe+70KnVtL1R FqhPUybtRJdXBaijvpfGvSA82KJq//ArHo5reWjnqHf8lj6ziU5+gcG6RtKI4WF2rErv UvBFNrZjU3AfC6Lf6GZfzGqfqwOmxx3hkSF4fTz3tTPFjW85wW81o2v0zgWiP8i0CWOM QZqQ== X-Received: by 10.181.12.1 with SMTP id em1mr13514910wid.4.1368613118035; Wed, 15 May 2013 03:18:38 -0700 (PDT) Received: from localhost.localdomain (host86-134-29-172.range86-134.btcentralplus.com. [86.134.29.172]) by mx.google.com with ESMTPSA id ge7sm3069902wib.6.2013.05.15.03.18.36 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 15 May 2013 03:18:37 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Wed, 15 May 2013 11:18:35 +0100 Message-Id: <1368613115-13584-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.8.1.2 Subject: [Buildroot] [PATCH v2] libxml2: depend on zlib and libiconv if appropriate 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: Simon Dawson Signed-off-by: Simon Dawson --- v2: As suggested by Peter Korsgaard, correct iconv handling to cope with the case where iconv() is provided by the toolchain, rather than by libiconv. package/libxml2/libxml2.mk | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 6a974ef..7800d94 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -34,6 +34,21 @@ else HOST_LIBXML2_CONF_OPT += --without-python endif +ifeq ($(BR2_PACKAGE_ZLIB),y) +LIBXML2_DEPENDENCIES += zlib +LIBXML2_CONF_OPT += --with-zlib +else +LIBXML2_CONF_OPT += --without-zlib +endif + +LIBXML2_DEPENDENCIES += $(if $(BR2_PACKAGE_LIBICONV),libiconv) + +ifeq ($(BR2_ENABLE_LOCALE)$(BR2_PACKAGE_LIBICONV),y) +LIBXML2_CONF_OPT += --with-iconv +else +LIBXML2_CONF_OPT += --without-iconv +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package))