From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms13.migadu.com with LMTPS id yPKQNsnyF2e8oAAA62LTzQ:P1 (envelope-from ) for ; Tue, 22 Oct 2024 18:45:30 +0000 Received: from aspmx1.migadu.com ([2001:41d0:303:e16b::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1.migadu.com with LMTPS id yPKQNsnyF2e8oAAA62LTzQ (envelope-from ) for ; Tue, 22 Oct 2024 20:45:30 +0200 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LGe8D6AV; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20230601.gappssmtp.com header.s=20230601 header.b=b3XNwKeI; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1729622729; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=D7CFXJ4gVe9W+FbBdxZjosu5+DFO16B2CZd9cJwHlUU=; b=WUXvHJTQPMwe1W9mUXuToA33UdaWh/mEQUJH+scwtKhSmWLSDnUqs39CQMoFUr1wa0ycVQ SGRuwqzuCQSprA2FWHEYTghwOkl4wa4scdt7W2n0A9qM6WSyA8C4Ho3tvfzWL6qkPIp2ri EZd8lgLpGLcFKQ0qiBeSvHPFLNBuSBSGBfmSrbRbt2b71lHp8Nh/JX33R60S8bhm++tIjD 2dBvcE7oKlzHUYdJ7MtIgW16sg27vYg34QMMxYpLUdvdygr6GpbvFPuqSXU6BvIGNzqj3h DG4MC0GFmmkWynWf6TD+04YDqW3WJisvBfvZnY5vTSaI0M59Y25dbLJINForsA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1729622729; a=rsa-sha256; cv=none; b=KYL0u82+GVK4J1MyIXbzueUtmxysGCxmBAaytYhsl+JpqVe9QWZvkAIr2hzr5JTwaJGgFU 43TxfVXmnLSiPLaaNbWeSnu+G4KC2KH8EoFAUuAKTNRO4xGCcSEkYKEyRIt4gLtKQPx0s6 xb42H5uT7+SPvR2vfuSZn32Lj4qOLWIgvtF7O1yL3mfiH56DUTbuJBxru2w6NreteUqERD 4RjOBuI4k+Dv1GKOxezMckY/PoCI7E3yxwAotgVBl4eg9NCY/IYIkG6KFCNJJtcaYyR00X 9IYiPlq82aG6xuABFjlxsjx/7Lk0j4ZMyb57aNjTYFyXLTofCAHpYtjvFqmJZg== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=pass header.d=debbugs.gnu.org header.s=debbugs-gnu-org header.b=LGe8D6AV; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20230601.gappssmtp.com header.s=20230601 header.b=b3XNwKeI; spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org"; dmarc=none Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 47F6F5F97A for ; Tue, 22 Oct 2024 20:45:29 +0200 (CEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t3JNO-0006o2-E1; Tue, 22 Oct 2024 14:13:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t3JNH-0006k9-24 for guix-patches@gnu.org; Tue, 22 Oct 2024 14:12:56 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1t3JNG-000835-Pb for guix-patches@gnu.org; Tue, 22 Oct 2024 14:12:54 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:References:In-Reply-To:Date:From:To:Subject; bh=D7CFXJ4gVe9W+FbBdxZjosu5+DFO16B2CZd9cJwHlUU=; b=LGe8D6AV+PXHb7HiyRFaxDSgx94TbG6wF+ErDFWEGh7Ed6VLqdU/WTfVX2PlfXubGCnZj41z++vQ1uj48rzhaw+HawCszJ0xoFbOEk9YA1KasPvpSg6fFquUALFE7LUgaiU62lwlxx0OLvwKyrDwp9RXWZXnCPh0x/AnAij6cCUAbNQPtxlXB2/X0PVjK+KgnJEWGnCvYMtO4PWp9IvfwHM6P+X8AGvk0u9NrVbDgnldc9AYxr4aRqcmBG60d/hl5R50vv5qgiGMEF/u/8R1LjLTS2OYZY5EUqWw+rjTP2r62lHEhh3s5n6eTxnA47XJcfYM+Zpa6J6NIErHTazRAw==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t3JNi-0008PE-Nt for guix-patches@gnu.org; Tue, 22 Oct 2024 14:13:22 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70031] [PATCH v2 39/65] gnu: cmake: Update to 3.30.5. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 22 Oct 2024 18:13:22 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 70031 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 70031@debbugs.gnu.org Cc: Greg Hogan Received: via spool by 70031-submit@debbugs.gnu.org id=B70031.172962079732201 (code B ref 70031); Tue, 22 Oct 2024 18:13:22 +0000 Received: (at 70031) by debbugs.gnu.org; 22 Oct 2024 18:13:17 +0000 Received: from localhost ([127.0.0.1]:57369 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3JNb-0008N3-VK for submit@debbugs.gnu.org; Tue, 22 Oct 2024 14:13:16 -0400 Received: from mail-qk1-f176.google.com ([209.85.222.176]:52386) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t3JMj-0008Bh-TW for 70031@debbugs.gnu.org; Tue, 22 Oct 2024 14:12:23 -0400 Received: by mail-qk1-f176.google.com with SMTP id af79cd13be357-7b175e059bdso84444485a.0 for <70031@debbugs.gnu.org>; Tue, 22 Oct 2024 11:11:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1729620648; x=1730225448; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=D7CFXJ4gVe9W+FbBdxZjosu5+DFO16B2CZd9cJwHlUU=; b=b3XNwKeIsQk0899Dmk0/9EgdyDtAphRSgOTbD+ilqEf6uYt53VABpWJG2t5bcnrE78 qgUCjr+fmPOychEjGO4Vd+6BPTfBZuv/mxkgj09k8aLxsocZCPuf2sDSg9Bay8cLtcir WMC1tp76L4RZjZbotcE49jbvQClG48nveacd+cGzRFxof26Q/LM/Idhp9xWDNOnUQ7iV uFaK7xmHihtblW+CLRBQix9MERJxzWsMZ2X2Ty1WRgcCbwWazd2ehI0OSQSEM30Vn9Om O4f8sNfkRowXQxodf8b0s+0dNf7ZK67+Xom5CBI8ietKL0Mt4c4g7MnzUP61I8UgNdou p2iQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1729620648; x=1730225448; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=D7CFXJ4gVe9W+FbBdxZjosu5+DFO16B2CZd9cJwHlUU=; b=h7vVTbDc6/Q2J8GbyJpM676dMqVpXY4yTLx3cfxeyLrtrmFO/VxIBkejekG0IrG3+R 0UmoovfPusBql1BgBgFF895SydZN0TcE/Psvq0gaHIqO7gby5q8KqMhInHS7VDwD9NJW mSpPt76Zq9BpxDrJTKyerNi+wyACyLKELYaaETaqtBza5/g9Cl1vs9QB0rhX7z8tE+os ViJx/Udx/Oj6hQVqx4+u6tkpNM6U4M5bO0KzRTfoZ5WaJHvuHiHzNcaTZSUo5/jdccww OO+raE0GjmYuXqqECjuo6V/S6uO9I92904tclHXj+kqu9FzGki3UjowVt6Samk48ZQrF +l6g== X-Gm-Message-State: AOJu0Yx9K9Rg/vGeI9j0pFMZpODmlSrgei3ii/2E+OSFvEpcHC/8IliQ 7mECx4dJSJ/jno+G0oN14Yzd8sv/gvJ/tLHFFLWprzolAMysS68WglL2uJyPdwDSiHa1RONxq/n F X-Google-Smtp-Source: AGHT+IG2kJ7h5e2C1+e2dYMQbiTt97O6OMSbgCUnavRvYJw6/dVia25TFxJFcAaZTaslQXZBTHPDLA== X-Received: by 2002:a05:620a:4551:b0:7b1:447f:d6f0 with SMTP id af79cd13be357-7b17dd0d765mr40217785a.23.1729620647984; Tue, 22 Oct 2024 11:10:47 -0700 (PDT) Received: from ip-10-114-89-186.evoforge.org (ec2-52-70-167-183.compute-1.amazonaws.com. [52.70.167.183]) by smtp.gmail.com with ESMTPSA id af79cd13be357-7b1659bb836sm302360785a.10.2024.10.22.11.10.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 22 Oct 2024 11:10:47 -0700 (PDT) From: Greg Hogan Date: Tue, 22 Oct 2024 18:09:29 +0000 Message-ID: <54a3d4a9e9465fbe389f0c6d3a59d05f68f0bbf0.1729619913.git.code@greghogan.com> X-Mailer: git-send-email 2.46.1 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Flow: FLOW_IN X-Migadu-Country: US X-Migadu-Spam-Score: -3.99 X-Spam-Score: -3.99 X-Migadu-Queue-Id: 47F6F5F97A X-Migadu-Scanner: mx13.migadu.com X-TUID: HU+ccODAh3xd * gnu/packages/cmake.scm (cmake-bootstrap): Update to 3.30.5. [source]: Remove the cmake-curl-certificates-3.24 patch. [arguments]<#:configure-flags>: Disable debugger. (cmake-minimal)[arguments] <#:configure-flags>: Disable debugger. <#:phases>: Output on failure in 'check phase. (cmake): Update to 3.30.5. [source]: Remove the cmake-curl-certificates-3.24 patch. [inputs]: Add cppdap. (cmake-3.30): Remove. (cmake-3.24): New variable. (%common-build-phases): Substitute for Ninja build. --- gnu/packages/cmake.scm | 40 ++++++++++++++++++++++------------------ 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/gnu/packages/cmake.scm b/gnu/packages/cmake.scm index 8310dc55fa..199e0182c6 100644 --- a/gnu/packages/cmake.scm +++ b/gnu/packages/cmake.scm @@ -15,6 +15,7 @@ ;;; Copyright © 2024 John Kehayias ;;; Copyright © 2024 dan ;;; Copyright © 2024 Charles +;;; Copyright © 2024 Greg Hogan ;;; ;;; This file is part of GNU Guix. ;;; @@ -126,6 +127,7 @@ (define (%common-build-phases) '("Modules/CompilerId/Xcode-3.pbxproj.in" "Modules/Internal/CPack/CPack.RuntimeScript.in" "Source/cmGlobalXCodeGenerator.cxx" + "Source/cmLocalNinjaGenerator.cxx" "Source/cmLocalUnixMakefileGenerator3.cxx" "Source/cmExecProgramCommand.cxx" "Tests/CMakeLists.txt" @@ -171,7 +173,7 @@ (define %preserved-third-party-files (define-public cmake-bootstrap (package (name "cmake-bootstrap") - (version "3.24.2") + (version "3.30.5") (source (origin (method url-fetch) (uri (string-append "https://cmake.org/files/v" @@ -179,8 +181,7 @@ (define-public cmake-bootstrap "/cmake-" version ".tar.gz")) (sha256 (base32 - "1ny8y2dzc6fww9gzb1ml0vjpx4kclphjihkxagxigprxdzq2140d")) - (patches (search-patches "cmake-curl-certificates-3.24.patch")))) + "0vd8ambs4r7yzwwshba0l0pl0b7q566a0pq6gsdz5wh80njf2mcz")))) (build-system gnu-build-system) (arguments (list @@ -203,7 +204,10 @@ (define-public cmake-bootstrap ;; By default CMake is built without any optimizations. Use ;; the recommended Release target for a ~2.5x speedup. - "--" "-DCMAKE_BUILD_TYPE=Release")) + "--" "-DCMAKE_BUILD_TYPE=Release" + + ;; The debugger creates a circular dependency on cppdap. + "-DCMake_ENABLE_DEBUGGER=OFF")) #:make-flags #~(let ((skipped-tests (list #$@%common-disabled-tests @@ -310,6 +314,8 @@ (define-public cmake-minimal (list #:configure-flags #~(list "-DCMAKE_USE_SYSTEM_LIBRARIES=ON" + ;; The debugger creates a circular dependency on cppdap. + "-DCMake_ENABLE_DEBUGGER=OFF" (string-append "-DCMAKE_DOC_DIR=share/doc/cmake-" #$(version-major+minor (package-version cmake-bootstrap)))) @@ -341,6 +347,7 @@ (define-public cmake-minimal (invoke "ctest" "-j" (if parallel-tests? (number->string (parallel-job-count)) "1") + "--output-on-failure" "--exclude-regex" (string-append "^(" (string-join skipped-tests "|") ")$"))) (format #t "test suite not run~%")))))) @@ -353,7 +360,7 @@ (define-public cmake (package (inherit cmake-minimal) (name "cmake") - (version "3.25.1") + (version "3.30.5") (source (origin (inherit (package-source cmake-minimal)) (method url-fetch) @@ -368,8 +375,7 @@ (define-public cmake ,@rest)))) (sha256 (base32 - "1n4inb3fvk70sni5gmkljqw3cyllalyg3fnr9rlr7x3aa44isl8w")) - (patches (search-patches "cmake-curl-certificates-3.24.patch")))) + "0vd8ambs4r7yzwwshba0l0pl0b7q566a0pq6gsdz5wh80njf2mcz")))) (outputs '("out" "doc")) (arguments (substitute-keyword-arguments (package-arguments cmake-minimal) @@ -406,7 +412,10 @@ (define-public cmake (delete-file-recursively (string-append #$output html))))))))) (inputs (modify-inputs (package-inputs cmake-minimal) - (prepend ncurses))) ;required for ccmake + (prepend ncurses) ;required for ccmake + ;; Avoid circular dependency with (gnu packages debug). + (prepend (module-ref (resolve-interface '(gnu packages debug)) + 'cppdap)))) ;; Extra inputs required to build the documentation. (native-inputs (modify-inputs (package-native-inputs cmake-minimal) @@ -414,10 +423,10 @@ (define-public cmake texinfo))) (properties (alist-delete 'hidden? (package-properties cmake-minimal))))) -(define-public cmake-3.30 +(define-public cmake-3.24 (package (inherit cmake) - (version "3.30.3") + (version "3.24.4") (source (origin (method url-fetch) (uri (string-append "https://cmake.org/files/v" @@ -425,14 +434,9 @@ (define-public cmake-3.30 "/cmake-" version ".tar.gz")) (sha256 (base32 - "1r48zym4dy4mvwzk704zh1vx9gb4a910f424ypvis28mcxdy2pbd")))) - (native-inputs - (modify-inputs (package-native-inputs cmake) - ;; Avoid circular dependency with (gnu packages debug). Note: cppdap - ;; is built with cmake, so when the default cmake is updated to this - ;; version this circular dependency will need to be worked around. - (prepend (module-ref (resolve-interface '(gnu packages debug)) - 'cppdap)))))) + "15i2zbxlksqv4czajpwcc1c21smgw2mzpbghsdq71zqfa6cy9j9j")) + (patches (search-patches "cmake-curl-certificates-3.24.patch")))) + (properties '((hidden? . #t))))) (define-public cmake-minimal-cross (package -- 2.46.1