From patchwork Wed Mar 27 14:52:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 62284 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id CE32127BBE9; Wed, 27 Mar 2024 14:54:36 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS autolearn=unavailable autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id B818527BBE2 for ; Wed, 27 Mar 2024 14:54:35 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpUfE-0000w3-8p; Wed, 27 Mar 2024 10:54:04 -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 1rpUfD-0000vR-3d for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:03 -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 1rpUfC-0008J5-Qd for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpUfC-0000qS-Uz for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70031] [core-updates PATCH 03/19] build-system/cmake: Add build. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 14:54:02 +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.17115512042993 (code B ref 70031); Wed, 27 Mar 2024 14:54:02 +0000 Received: (at 70031) by debbugs.gnu.org; 27 Mar 2024 14:53:24 +0000 Received: from localhost ([127.0.0.1]:38097 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUeZ-0000lz-Ou for submit@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:24 -0400 Received: from mail-qt1-x835.google.com ([2607:f8b0:4864:20::835]:42490) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUeY-0000lM-3z for 70031@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:22 -0400 Received: by mail-qt1-x835.google.com with SMTP id d75a77b69052e-42e323a2e39so8034591cf.1 for <70031@debbugs.gnu.org>; Wed, 27 Mar 2024 07:53:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1711551196; x=1712155996; 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=iq610vCDMBRJmPHdWAtmSDHcKQWwOst77oXnrzFhQkM=; b=A0zdQGq//Lh9nc+576o24AphcvsPQwOgbsJKkO1q4AMt7pyPy/uBzf6qFBbDTaHCTO RkLqHkr7MxtYQm7DSnmV+nZgMhXLL1XA7MzavFrttvA/doJJ+5nybRKKyZKZf0p8tcm3 Uo0pKoPTKvuh1P5buCY1TvCzu5cC2leb25xH3/8LZFNb62x5AAwPW6niSgmtfdL/oPWE ja71wcpOT/K1b0kM36QFZ+PMpxlyO+ycC8KgtpCHccr3NisGMqDhM7GiBlCcHHSQGofW LX7z2JJr0L7yJxiA99sb3JHrIC/A50Xsn9EBtGi5PTgNDom7Xf5+l07a2HqrOgWRU7xG 7I8A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711551196; x=1712155996; 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=iq610vCDMBRJmPHdWAtmSDHcKQWwOst77oXnrzFhQkM=; b=rOot8pUGj8rnd2bwuw2WsqitMbWbIXq8bcldixkepZovKelzprel6EGOP49njcppdx GVf/m5n7RZAsCfw/LEXjS2U0FNQRHBV85v9jXtO1Ic5yectV46zf7/Dta7bo2PDTCZ4h BybnbWNDWnQMZxALET/X8ysjKn4i9syuMLM+Fcki8mzBqd8O959/9xyaj66CBHcnAy1U fQvpl1iv1oy2p/D/iFDPkw1oipKNpP9DvZVq40k9Fm+Dy7O02qmhvqdhgoK7GObUBt8A bS0Z1I1QDZYK/qwQtZVtriU1hfEUPT0OrOiN2ku+JHvythavpZv9m7eWZw+hIxSCfue4 1nMw== X-Gm-Message-State: AOJu0YzLryHU+KSevsWGErB8qyA3/G2YG035+V9maQGvwxdhITI2Nrq3 moSKJle8PpzuhiHnvASAoZjOzS4Q8zma+C7oBwaF0kBQ9KeHncwKGL79Hor0kkcvMgJ9RETHb4Z u X-Google-Smtp-Source: AGHT+IF++BvLpxJ06JahrpKPVqX0NP3GCoBNPzPlpfBO6+SlbE88pYgHxxDFWV1TLx/0DY44+xCJlw== X-Received: by 2002:a05:622a:1a2a:b0:431:5077:e5b0 with SMTP id f42-20020a05622a1a2a00b004315077e5b0mr260111qtb.15.1711551196261; Wed, 27 Mar 2024 07:53:16 -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 fk23-20020a05622a559700b00430c8b87b46sm4882915qtb.6.2024.03.27.07.53.15 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 27 Mar 2024 07:53:16 -0700 (PDT) From: Greg Hogan Date: Wed, 27 Mar 2024 14:52:28 +0000 Message-ID: X-Mailer: git-send-email 2.44.0 In-Reply-To: References: MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * guix/build/cmake-build-system.scm (build): New function to replace the make build with the cmake build command. --- guix/build/cmake-build-system.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index 1775f7a7509..8f1c80aeb64 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -81,6 +81,14 @@ (define* (configure #:key outputs (configure-flags '()) (out-of-source? #t) (format #t "running 'cmake' with arguments ~s~%" args) (apply invoke "cmake" args)))) +(define* (build #:key (parallel-build? #t) #:allow-other-keys) + (apply invoke "cmake" + `("--build" + "." + ,@(if parallel-build? + `("-j" ,(number->string (parallel-job-count))) + '())))) + (define %test-suite-log-regexp ;; Name of test suite log files as commonly found in CMake. "^LastTestFailed\\.log$") @@ -102,10 +110,9 @@ (define* (check #:key (tests? #t) (parallel-tests? #t) (format #t "test suite not run~%"))) (define %standard-phases - ;; Everything is as with the GNU Build System except for the `configure' - ;; and 'check' phases. (modify-phases gnu:%standard-phases (delete 'bootstrap) + (replace 'build build) (replace 'check check) (replace 'configure configure)))