From patchwork Sun Oct 27 14:40:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Hilliard X-Patchwork-Id: 1185027 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.138; helo=whitealder.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="SCXpdY/B"; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 471L9k5lsKz9sP3 for ; Mon, 28 Oct 2019 01:40:26 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id CA9658558D; Sun, 27 Oct 2019 14:40:24 +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 t1DbwCv7W95q; Sun, 27 Oct 2019 14:40:22 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id E318F85329; Sun, 27 Oct 2019 14:40:21 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id CB7CA1BF5DA for ; Sun, 27 Oct 2019 14:40:20 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id C4EA685044 for ; Sun, 27 Oct 2019 14:40:20 +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 3X8helJF5Qie for ; Sun, 27 Oct 2019 14:40:20 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-io1-f68.google.com (mail-io1-f68.google.com [209.85.166.68]) by whitealder.osuosl.org (Postfix) with ESMTPS id DEE7D8503D for ; Sun, 27 Oct 2019 14:40:19 +0000 (UTC) Received: by mail-io1-f68.google.com with SMTP id u8so7623646iom.5 for ; Sun, 27 Oct 2019 07:40:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q3fULpwdr2ZkKYSl9eDsZ5/amDMoy3YiFILpaEtYUh4=; b=SCXpdY/B+YNBjeKXyk49bScpxP7Ly7a6QZNFVfHhpV3IZAL2KIJYKBAPv/n58THz4Q OMqcSulunGObMISN7xb7cr89zUnqvnlSGyOB+tVGJzFQ08LZViIb7RH7z/ll0UeIbRPc p7uRVqtaIFRYHKHYKzYDPYoix88zR4+dpluafHhzoLT0KegxDVyBQaMCeXsh2FhYrZat 2fYiK2fnSp7blQ/VJ/+6RHKwGggcHVaSgH3bofXd6nD6nzhoPZW/BL8nuD5RuUpCTScu HBq3vIre39NSF1K3w+XuzbNCW0KqQoG3XoEu6wNNoVY6HAK/pBjlk4mQa3pyzm5/Kqh5 btCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=q3fULpwdr2ZkKYSl9eDsZ5/amDMoy3YiFILpaEtYUh4=; b=Z4Kf6VKi76wuhsP4+fYETWewosEY4gliCTIpC+I1mCtJAKnHCCN3mTtT6C4UIomVLg u1RBSRGbTz6a6/kh1GsKd91mC3nXeNyd75Tl+kRFH8nJhEmHhlb7zWSHdcPF3pyjZrzD zkWh/bfkP1+sSlUFmy3XLmElTKyJOGo4EDX1Ll3wlT3/dMB0LteL2M+UIiAOtHcj0VIp X8eDNVQnBiqyFeSjGKneiu070lppG4VVoiEcQ3lnfL5FUvlz7DBSNifMU7fsmop81T3F 5DYhqOvCmTZJzU3gl93bvadiPzpoIPEKk8uRjwSpQ9pQjkd5dcQTOgSuJtbcoYg4YxxC zkxw== X-Gm-Message-State: APjAAAXB/6zZXFdOU4QA0BWFK0KNIDX8WYVaI4yI4u+CplVg2e8eQLA8 NGtlBPl/zMpv68bxJZ/yenU9IS+MKPw= X-Google-Smtp-Source: APXvYqyuF46rLqkYrjm/MH4JPAp1tj60gNOdhHJ4YXs3V7k/cpLXVN0ITqSWHSu4ygHj7L+dagEVHA== X-Received: by 2002:a02:a1c8:: with SMTP id o8mr12864502jah.82.1572187218453; Sun, 27 Oct 2019 07:40:18 -0700 (PDT) Received: from james-x399.localdomain (71-218-230-115.hlrn.qwest.net. [71.218.230.115]) by smtp.gmail.com with ESMTPSA id y5sm1138634ill.86.2019.10.27.07.40.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 27 Oct 2019 07:40:17 -0700 (PDT) From: James Hilliard To: buildroot@buildroot.org Date: Sun, 27 Oct 2019 08:40:14 -0600 Message-Id: <20191027144014.126396-1-james.hilliard1@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Subject: [Buildroot] [PATCH v6 1/1] cmake: bump to version 3.15.4 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Adrian Perez de Castro , James Hilliard , Fabrice Fontaine , Thomas Petazzoni Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Remove FindLibUV patch which is now upstream. Resync/reformat rename cmake rootfile patch for 3.15.4 with git format-patch. Signed-off-by: James Hilliard Reviewed-by: Adrian Perez de Castro --- Changes v5 -> v6: - drop separate packages and support for older toolchains - bump to 3.15.4 instead of 3.15.3 Changes v4 -> v5: - create separate cmake packages Changes v3 -> v4: - retain support for version 3.8.2 for older toolchains Changes v2 -> v3: - split minimum cmake off from cmake version bump Changes v1 -> v2: - Set cmake version min to 3.10. --- ...patch => 0001-rename-cmake-rootfile.patch} | 32 +++++++++++++------ ...k-uv-version-h-for-version-detection.patch | 32 ------------------- package/cmake/cmake.hash | 6 ++-- package/cmake/cmake.mk | 4 +-- 4 files changed, 28 insertions(+), 46 deletions(-) rename package/cmake/{0001-rename_cmake_rootfile.patch => 0001-rename-cmake-rootfile.patch} (50%) delete mode 100644 package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch diff --git a/package/cmake/0001-rename_cmake_rootfile.patch b/package/cmake/0001-rename-cmake-rootfile.patch similarity index 50% rename from package/cmake/0001-rename_cmake_rootfile.patch rename to package/cmake/0001-rename-cmake-rootfile.patch index 8c168c15a8..a8cd3ee820 100644 --- a/package/cmake/0001-rename_cmake_rootfile.patch +++ b/package/cmake/0001-rename-cmake-rootfile.patch @@ -1,3 +1,8 @@ +From 68d3b1dfbbd2f54bf81986d1d733deaf66658b15 Mon Sep 17 00:00:00 2001 +From: Davide Viti +Date: Thu, 14 Jul 2016 10:14:59 +0100 +Subject: [PATCH] rename cmake rootfile + ctest fails on the target, because it cannot find CMake.cmake inside CMAKE_DATA_DIR (typically set to "/usr/share/cmake-3.0"): all *.cmake files are removed at build time via the target-finalize rule. @@ -6,24 +11,33 @@ This buildroot-specific patch makes sure ctest looks also for "Modules/CMake.cmake.ctest" before complaining [Vincent: tweak patch for 3.6.3] +[James: tweak patch for 3.15.4] Signed-off-by: Davide Viti Signed-off-by: Vicente Olivert Riera +Signed-off-by: James Hilliard +--- + Source/cmake.cxx | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) -diff -rup a/Source/cmake.cxx b/Source/cmake.cxx ---- a/Source/cmake.cxx 2016-07-07 15:47:27.000000000 +0100 -+++ b/Source/cmake.cxx 2016-07-14 10:14:59.914265515 +0100 -@@ -771,7 +771,12 @@ int cmake::AddCMakePaths() - "Path to cpack program executable.", cmState::INTERNAL); +diff --git a/Source/cmake.cxx b/Source/cmake.cxx +index 3772f09985..c317e4af38 100644 +--- a/Source/cmake.cxx ++++ b/Source/cmake.cxx +@@ -1009,7 +1009,12 @@ int cmake::AddCMakePaths() + "Path to cpack program executable.", cmStateEnums::INTERNAL); #endif if (!cmSystemTools::FileExists( -- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str())) { -+ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake").c_str()) && -+ !cmSystemTools::FileExists( -+ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest").c_str() +- (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake"))) { ++ (cmSystemTools::GetCMakeRoot() + "/Modules/CMake.cmake")) && ++ !cmSystemTools::FileExists( ++ (cmSystemTools::GetCMakeRoot()+"/Modules/CMake.cmake.ctest") + ) + ) + { // couldn't find modules cmSystemTools::Error( "Could not find CMAKE_ROOT !!!\n" +-- +2.20.1 + diff --git a/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch b/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch deleted file mode 100644 index 9abf1a538f..0000000000 --- a/package/cmake/0002-FindLibUV-Also-check-uv-version-h-for-version-detection.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 92c4b3d900a24512967a960f108d985c819fdf00 Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Sat, 23 Jun 2018 20:30:07 +0200 -Subject: [PATCH] FindLibUV: Also check uv/version.h for version detection - -Starting with libuv 1.21.0, libuv's headers were moved into a uv/ directory. -Make FindLibUV aware of the file's new location for configuration to work. - -Upstream change: https://github.com/libuv/libuv/pull/1429 - -Signed-off-by: Fabrice Fontaine -[Retrieve from: https://gitlab.kitware.com/cmake/cmake/merge_requests/2169] ---- - Source/Modules/FindLibUV.cmake | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/Source/Modules/FindLibUV.cmake b/Source/Modules/FindLibUV.cmake -index ba13d75f8b..0554d62c23 100644 ---- a/Source/Modules/FindLibUV.cmake -+++ b/Source/Modules/FindLibUV.cmake -@@ -63,6 +63,8 @@ mark_as_advanced(LibUV_INCLUDE_DIR) - set(_LibUV_H_REGEX "#[ \t]*define[ \t]+UV_VERSION_(MAJOR|MINOR|PATCH)[ \t]+[0-9]+") - if(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv-version.h") - file(STRINGS "${LibUV_INCLUDE_DIR}/uv-version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") -+elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv/version.h") -+ file(STRINGS "${LibUV_INCLUDE_DIR}/uv/version.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") - elseif(LibUV_INCLUDE_DIR AND EXISTS "${LibUV_INCLUDE_DIR}/uv.h") - file(STRINGS "${LibUV_INCLUDE_DIR}/uv.h" _LibUV_H REGEX "${_LibUV_H_REGEX}") - else() --- -2.16.4 - diff --git a/package/cmake/cmake.hash b/package/cmake/cmake.hash index 340c81b9c9..bbf6e19f27 100644 --- a/package/cmake/cmake.hash +++ b/package/cmake/cmake.hash @@ -1,5 +1,5 @@ -# From https://cmake.org/files/v3.9/cmake-3.9.6-SHA-256.txt -sha256 7410851a783a41b521214ad987bb534a7e4a65e059651a2514e6ebfc8f46b218 cmake-3.9.6.tar.gz +# From https://cmake.org/files/v3.15/cmake-3.15.4-SHA-256.txt +sha256 8a211589ea21374e49b25fc1fc170e2d5c7462b795f1b29c84dd0e984301ed7a cmake-3.15.4.tar.gz # Locally calculated -sha256 9d8604f7afc5564ceb9705ba121f5fba2782ce18d92902f3c6ed338228372170 Copyright.txt +sha256 dc628fb936a5d229296d42083f9a8218aa32204c016919e784404c9ec58776e9 Copyright.txt diff --git a/package/cmake/cmake.mk b/package/cmake/cmake.mk index e816963089..7c6ddf57a4 100644 --- a/package/cmake/cmake.mk +++ b/package/cmake/cmake.mk @@ -4,8 +4,8 @@ # ################################################################################ -CMAKE_VERSION_MAJOR = 3.9 -CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).6 +CMAKE_VERSION_MAJOR = 3.15 +CMAKE_VERSION = $(CMAKE_VERSION_MAJOR).4 CMAKE_SITE = https://cmake.org/files/v$(CMAKE_VERSION_MAJOR) CMAKE_LICENSE = BSD-3-Clause CMAKE_LICENSE_FILES = Copyright.txt