From patchwork Wed Feb 26 21:27:35 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Petazzoni X-Patchwork-Id: 324630 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 4A0DF2C009A for ; Thu, 27 Feb 2014 08:27:40 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 21B798BD33; Wed, 26 Feb 2014 21:27:40 +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 3CP05Zy-lMH9; Wed, 26 Feb 2014 21:27:39 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 798868BD30; Wed, 26 Feb 2014 21:27:39 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (silver.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D64B41BF856 for ; Wed, 26 Feb 2014 21:27:38 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id B3E3230A7B for ; Wed, 26 Feb 2014 21:27:38 +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 6vc8p4QHNPNx for ; Wed, 26 Feb 2014 21:27:38 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail.free-electrons.com (top.free-electrons.com [176.31.233.9]) by silver.osuosl.org (Postfix) with ESMTP id 1C34726416 for ; Wed, 26 Feb 2014 21:27:38 +0000 (UTC) Received: by mail.free-electrons.com (Postfix, from userid 106) id E554E7E9; Wed, 26 Feb 2014 22:27:38 +0100 (CET) Received: from localhost (13-105-190-109.dsl.ovh.fr [109.190.105.13]) by mail.free-electrons.com (Postfix) with ESMTPSA id 84B307A9 for ; Wed, 26 Feb 2014 22:27:38 +0100 (CET) From: Thomas Petazzoni To: buildroot@uclibc.org Date: Wed, 26 Feb 2014 22:27:35 +0100 Message-Id: <1393450055-30751-1-git-send-email-thomas.petazzoni@free-electrons.com> X-Mailer: git-send-email 1.8.3.2 Subject: [Buildroot] [PATCH] libxml2: do not detect zlib/lzma when not available 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 The host-libxml2 package does not depend on zlib or lzma, but may detect versions available on the host. This can cause problems in the following situation: 1 host-libxml2 is built, finds an available lzma library in the system, enables lzma support by using it. 2 host-xz is built, which installs a different version of the lzma library into $(HOST_DIR) 3 host-libxslt is built, tries to link against libxml2, which fails because now the visible lzma library is the one from $(HOST_DIR)/usr/lib and no longer the one libxml2 was built agains. To fix this, this patch passes --without-zlib and --without-lzma to the host package. In addition, since the target variant of libxml2 does not have provisions to depend on the target lzma, we also pass --without-lzma for the target variant. The case of zlib for the target was already properly taken into account. Fixes: http://autobuild.buildroot.org/results/6dc/6dcef647eb0f0db7de3f34194eb15ceebc645b39/ Signed-off-by: Thomas Petazzoni --- package/libxml2/libxml2.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/package/libxml2/libxml2.mk b/package/libxml2/libxml2.mk index 7116b82..62f3e27 100644 --- a/package/libxml2/libxml2.mk +++ b/package/libxml2/libxml2.mk @@ -16,15 +16,17 @@ ifneq ($(BR2_LARGEFILE),y) LIBXML2_CONF_ENV = CC="$(TARGET_CC) $(TARGET_CFLAGS) -DNO_LARGEFILE_SOURCE" endif -LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug +LIBXML2_CONF_OPT = --with-gnu-ld --without-python --without-debug --without-lzma HOST_LIBXML2_DEPENDENCIES = host-pkgconf +HOST_LIBXML2_CONF_OPT = --without-zlib --without-lzma + # mesa3d uses functions that are only available with debug ifeq ($(BR2_PACKAGE_MESA3D),y) -HOST_LIBXML2_CONF_OPT = --with-debug +HOST_LIBXML2_CONF_OPT += --with-debug else -HOST_LIBXML2_CONF_OPT = --without-debug +HOST_LIBXML2_CONF_OPT += --without-debug endif ifeq ($(BR2_PACKAGE_HOST_LIBXML2_PYTHON),y)