From patchwork Tue Feb 28 18:07:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Yann E. MORIN" X-Patchwork-Id: 733737 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3vXml323sCz9s8N for ; Wed, 1 Mar 2017 05:07:43 +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="gcnpC4mj"; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 3749F872DB; Tue, 28 Feb 2017 18:07:39 +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 6BOUw6D3iwn3; Tue, 28 Feb 2017 18:07:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id A5DF187357; Tue, 28 Feb 2017 18:07:36 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 3CB941C0489 for ; Tue, 28 Feb 2017 18:07:32 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 0746685510 for ; Tue, 28 Feb 2017 18:07: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 lE7PG8-Q6rBF for ; Tue, 28 Feb 2017 18:07:31 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr0-f193.google.com (mail-wr0-f193.google.com [209.85.128.193]) by fraxinus.osuosl.org (Postfix) with ESMTPS id 5025685535 for ; Tue, 28 Feb 2017 18:07:31 +0000 (UTC) Received: by mail-wr0-f193.google.com with SMTP id l37so2570291wrc.3 for ; Tue, 28 Feb 2017 10:07:31 -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=rebX89sryKDKAVASTuTzMPkVYOIbFpbBykHyCZkv3qg=; b=gcnpC4mji/GZU+7EaczKIKB7+XlCmVTjeFHyiE1LgsvFpJINXVjTJu1AHjwaq5VpeA oC9L2IUIJiS6PeG7Zx1RJozjSl9+ZLXtMBkfdQB3qZHTRTWFs5McoKObvGPEV5kwX2Ut rThqmW7i1eAFO33JI1wPazKhMZdeoV6lmtI2kHBpIS5+WcP0+cs3r+UYKCb8hhft+T2A LgGtFm9omLjezED1txeajnpULmebJBG27cg98okuOZatVCZcpvIHdC+zdngJigIufg1S bqDDSBjwh/OvsxLZoSlKuXtudScIlhaEGqmap4S5GDqxbSMAbNsujgs4Z4MSaiL8pF0X OC1w== 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=rebX89sryKDKAVASTuTzMPkVYOIbFpbBykHyCZkv3qg=; b=nGVM9N42m8DwHiCHglgNbqETF5kSaH1hYU5VsVprz4nIhsj3jTWIL/LtQWEeMGBSFm ScA/0A5Y+by9f7BcH4fdz9M/j93xtDMyoIu+DefnN8It3rMWjHplmaZCtttVoHH6+ihQ LPk9ScWABMUHsBOfpp1fXCgM+fXddG1wzeKmwI3PfEcIy1JKEvmHWkdWqWh9Kj8eVr+A SCTCKl/FxY5+WDfkaG7UW/nTxCO1TxDJZ4wnKhI6VwLGJOBSM1o5sR7pqF9XilIURbia plIH71bfLAo+/QCl/1RBbHJyKSUZ5miJLXMbENPtgtk03Lqh4/+TH3o6xL59omOJVfoL fuJg== X-Gm-Message-State: AMke39l11S7COfH7Pz8o1h5a2OTx+FYAVpVQJ0g8203prec4nxa8NZ716R7bJUXwDgfBVQ== X-Received: by 10.223.136.213 with SMTP id g21mr3516103wrg.189.1488305249854; Tue, 28 Feb 2017 10:07:29 -0800 (PST) Received: from gourin.bzh.lan (ns304657.ip-46-105-103.eu. [46.105.103.66]) by smtp.gmail.com with ESMTPSA id 10sm19544942wmi.23.2017.02.28.10.07.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Tue, 28 Feb 2017 10:07:29 -0800 (PST) From: "Yann E. MORIN" To: buildroot@buildroot.org Date: Tue, 28 Feb 2017 19:07:23 +0100 Message-Id: <1b3b4b85a1ea24d17f8a33729d956a2bdcffb14a.1488305206.git.yann.morin.1998@free.fr> X-Mailer: git-send-email 2.7.4 In-Reply-To: References: Cc: Thomas Petazzoni Subject: [Buildroot] [PATCH 2/5] cmake: bump version to 3.7.0 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" From: Vicente Olivert Riera libuv is now a required dependency. Signed-off-by: Vicente Olivert Riera Tested-by: Samuel Martin Signed-off-by: Thomas Petazzoni --- package/cmake/Config.in | 9 +++++++-- package/cmake/cmake.hash | 4 ++-- package/cmake/cmake.mk | 6 +++--- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/package/cmake/Config.in b/package/cmake/Config.in index 6f04a4a..716d80e 100644 --- a/package/cmake/Config.in +++ b/package/cmake/Config.in @@ -20,11 +20,14 @@ config BR2_PACKAGE_CMAKE_CTEST select BR2_PACKAGE_EXPAT select BR2_PACKAGE_BZIP2 select BR2_PACKAGE_XZ + select BR2_PACKAGE_LIBUV depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS depends on BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 # from jsoncpp depends on BR2_USE_WCHAR # libarchive depends on BR2_INSTALL_LIBSTDCPP depends on !BR2_STATIC_LIBS + depends on BR2_TOOLCHAIN_HAS_THREADS # libuv + depends on BR2_USE_MMU # libuv help CTest is a testing tool distributed as a part of CMake. It can be used to automate updating (using CVS for example), @@ -34,7 +37,9 @@ config BR2_PACKAGE_CMAKE_CTEST http://www.cmake.org/ -comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7" +comment "ctest needs a toolchain w/ C++, wchar, dynamic library, gcc >= 4.7, threads" depends on BR2_PACKAGE_CMAKE_ARCH_SUPPORTS + depends on BR2_USE_MMU depends on !BR2_INSTALL_LIBSTDCPP || !BR2_USE_WCHAR || \ - BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 + BR2_STATIC_LIBS || !BR2_TOOLCHAIN_GCC_AT_LEAST_4_7 || \ + !BR2_TOOLCHAIN_HAS_THREADS diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index f846dc9..687e5a4 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,2 +1,2 @@ -# From http://www.cmake.org/files/v3.6/cmake-3.6.3-SHA-256.txt -sha256 7d73ee4fae572eb2d7cd3feb48971aea903bb30a20ea5ae8b4da826d8ccad5fe cmake-3.6.3.tar.gz +# From http://www.cmake.org/files/v3.7/cmake-3.7.0-SHA-256.txt +sha256 ed63e05c41aeb6c036e503114ab15847f29c312f9f21f5f1a7060a4b4ec2fb31 cmake-3.7.0.tar.gz diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index bc55509..e4904fc 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.6 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).3 +CMAKE_VERSION_MAJOR = 3.7 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).0 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3c CMAKE_LICENSE_FILES = Copyright.txt @@ -22,7 +22,7 @@ CMAKE_LICENSE_FILES = Copyright.txt # the system-wide libraries instead of rebuilding and statically # linking with the ones bundled into the CMake sources. -CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz +CMAKE_DEPENDENCIES = zlib jsoncpp libcurl libarchive expat bzip2 xz libuv CMAKE_CONF_OPTS = \ -DKWSYS_LFS_WORKS=TRUE \