From patchwork Tue May 14 08:29:43 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon Dawson X-Patchwork-Id: 243626 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 9EBE12C0099 for ; Tue, 14 May 2013 18:29:54 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E66E624F41; Tue, 14 May 2013 08:29:51 +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 F0pumUuroTaK; Tue, 14 May 2013 08:29:51 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id E675325D6C; Tue, 14 May 2013 08:29:50 +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 C65298F7A0 for ; Tue, 14 May 2013 08:29:56 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 80FD88C865 for ; Tue, 14 May 2013 08:29: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 095MkYjHjgtl for ; Tue, 14 May 2013 08:29:48 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-we0-f169.google.com (mail-we0-f169.google.com [74.125.82.169]) by whitealder.osuosl.org (Postfix) with ESMTPS id 6BF8D8B1E5 for ; Tue, 14 May 2013 08:29:48 +0000 (UTC) Received: by mail-we0-f169.google.com with SMTP id x54so209596wes.14 for ; Tue, 14 May 2013 01:29:46 -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=5Dl+lyapKPlqXsi84+Wp9t3BIaFnNHYyTeaPPlW3dOE=; b=g2KTgW2QaBa2tM/FuVAxG0J+yYeoMdzeiNmIP2yo5bNUjCmQ7cljJh74gHK/UaGMfM hx39Y6SWYeDifG+Ea/xGbjihUoDLt6kyPbO/WU5v+Nao2n3OxiMcdyrT9Fpq3Jn8qLJ8 RyvPR4u/ngZxxKFvfMpaMGJzs4cgg2j288JE47kVgb1w+Vve7VhIpZ4Z8d2MoyqH0obS OtvBNmUoxdIPtnESGdmqXJDOqcty9zf0vIUOkrEt/kaM5STiUfS4JREtc87oK4sK7kJL 8+Z1XJBY4VS9bKIzd/+K0b0tJXlEj8xWX8gWNLvngWxYiZzWXaylZXdrMnwgaBa8ucW2 nLjw== X-Received: by 10.180.90.164 with SMTP id bx4mr4093867wib.13.1368520186636; Tue, 14 May 2013 01:29:46 -0700 (PDT) Received: from localhost.localdomain (host86-134-29-90.range86-134.btcentralplus.com. [86.134.29.90]) by mx.google.com with ESMTPSA id ge7sm22116332wib.6.2013.05.14.01.29.44 for (version=TLSv1.1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Tue, 14 May 2013 01:29:45 -0700 (PDT) From: spdawson@gmail.com To: buildroot@busybox.net Date: Tue, 14 May 2013 09:29:43 +0100 Message-Id: <1368520183-8049-1-git-send-email-spdawson@gmail.com> X-Mailer: git-send-email 1.8.1.2 Subject: [Buildroot] [PATCH] 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 --- package/libxml2/libxml2.mk | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 6a974ef..1a98cdd 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -34,6 +34,20 @@ 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 + +ifeq ($(BR2_PACKAGE_LIBICONV),y) +LIBXML2_DEPENDENCIES += libiconv +LIBXML2_CONF_OPT += --with-iconv +else +LIBXML2_CONF_OPT += --without-iconv +endif + $(eval $(autotools-package)) $(eval $(host-autotools-package))