From patchwork Wed Mar 4 11:07:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Fabio Porcedda X-Patchwork-Id: 446194 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 A07A81401DD for ; Wed, 4 Mar 2015 22:07:29 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="verification failed; unprotected key" header.d=gmail.com header.i=@gmail.com header.b=HRaA5tT4; dkim-adsp=none (unprotected policy); dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id E899BA3433; Wed, 4 Mar 2015 11:07:28 +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 PYxKH6Ka_43a; Wed, 4 Mar 2015 11:07:27 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 286ADA339C; Wed, 4 Mar 2015 11:07:27 +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 B8E7F1C0B89 for ; Wed, 4 Mar 2015 11:07:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id B420891E34 for ; Wed, 4 Mar 2015 11:07:25 +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 St-qiDDILXL3 for ; Wed, 4 Mar 2015 11:07:25 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-pd0-f173.google.com (mail-pd0-f173.google.com [209.85.192.173]) by whitealder.osuosl.org (Postfix) with ESMTPS id 0FBC291E2B for ; Wed, 4 Mar 2015 11:07:25 +0000 (UTC) Received: by pdjp10 with SMTP id p10so19432649pdj.10 for ; Wed, 04 Mar 2015 03:07:24 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:mime-version:content-type :content-transfer-encoding; bh=6FhKOLyxaGeF5uJMp5RKHsmhsSX1viPfBPIGZ0nLWF0=; b=HRaA5tT4NZ9D2QlcQHuHCh1px38vVSk6NlJhJ8PVZXuCvxjFO7fRvBFdMaAb7uOr4g eDYSoxXY/tYquCLSRLPwjy/zDD9F6yHiNvceLqdOW3dNz3JvRyIS3ViwZH8OdIc87vAv 3l4abxG6SLXROraYBdl2tZYHCWUgEPY6PB/6CgJlxJpESOTjUJLxNModIrTNOcUMRsVr ZlMO5n8PleyvhVLcQb0Owd6WEnQuvsGxFZN4Covja++1d456eTCA5AVMj+Q7msTsEeGw xSmugbC5CHvBVSWPtmPUygRV78zQObvO2SlkG4SZwaBdHbZy8/0Khv1Sk4wEbmRSwIsI 6stg== X-Received: by 10.68.98.98 with SMTP id eh2mr5982529pbb.112.1425467244790; Wed, 04 Mar 2015 03:07:24 -0800 (PST) Received: from ld2077.tmt.telital.com ([213.205.6.118]) by mx.google.com with ESMTPSA id iy2sm3728599pbb.22.2015.03.04.03.07.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 04 Mar 2015 03:07:24 -0800 (PST) From: Fabio Porcedda To: buildroot@uclibc.org Date: Wed, 4 Mar 2015 12:07:16 +0100 Message-Id: <1425467236-27158-1-git-send-email-fabio.porcedda@gmail.com> X-Mailer: git-send-email 2.3.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH] cmake: use system libzma when the xz package is enabled 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: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fix build failure: .../output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_buffer_decoder.c:17:1: error: conflicting types for ‘lzma_block_buffer_decode’ lzma_block_buffer_decode(lzma_block *block, lzma_allocator *allocator, ^ In file included from /home/tetsuya/buildroot/br2/output/host/usr/include/lzma.h:296:0, from /home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/common.h:34, from /home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_decoder.h:16, from /home/tetsuya/buildroot/br2/output/build/host-cmake-3.1.3/Utilities/cmliblzma/liblzma/common/block_buffer_decoder.c:13: /home/tetsuya/buildroot/br2/output/host/usr/include/lzma/block.h:577:27: note: previous declaration of ‘lzma_block_buffer_decode’ was here extern LZMA_API(lzma_ret) lzma_block_buffer_decode( ^ Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/build.make:261: recipe for target 'Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/liblzma/common/block_buffer_decoder.c.o' failed make[3]: *** [Utilities/cmliblzma/CMakeFiles/cmliblzma.dir/liblzma/common/block_buffer_decoder.c.o] Error 1 Fixes: http://autobuild.buildroot.org/results/4edf6e169dc4a00d8a8bd16a86eba2316cbbd9e5 http://autobuild.buildroot.org/results/a9ff38b22a36a2f8427d33085d3263a8cbfbd746 http://autobuild.buildroot.org/results/ecaa0227249207b5450519832a193c1585ac8177 Signed-off-by: Fabio Porcedda --- package/cmake/cmake.mk | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index 8c64b58..4b53559 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -12,6 +12,11 @@ CMAKE_LICENSE_FILES = Copyright.txt HOST_CMAKE_DEPENDENCIES = host-pkgconf +ifeq ($(BR2_PACKAGE_XZ),y) + HOST_CMAKE_DEPENDENCIES += host-xz + HOST_CMAKE_CONF_OPTS += -DCMAKE_USE_SYSTEM_LIBLZMA=ON +endif + define HOST_CMAKE_CONFIGURE_CMDS (cd $(@D); \ LDFLAGS="$(HOST_LDFLAGS)" \ @@ -22,6 +27,7 @@ define HOST_CMAKE_CONFIGURE_CMDS -DCMAKE_CXX_FLAGS="$(HOST_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$(HOST_LDFLAGS)" \ -DBUILD_CursesDialog=OFF \ + $(HOST_CMAKE_CONF_OPTS) \ ) endef