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 ms8.migadu.com with LMTPS id 2PKKBCwzBGYh2wAA62LTzQ:P1 (envelope-from ) for ; Wed, 27 Mar 2024 15:54:36 +0100 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 2PKKBCwzBGYh2wAA62LTzQ (envelope-from ) for ; Wed, 27 Mar 2024 15:54:36 +0100 X-Envelope-To: larch@yhetil.org Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20230601.gappssmtp.com header.s=20230601 header.b="A0zdQGq/"; 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=1711551275; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: 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=iq610vCDMBRJmPHdWAtmSDHcKQWwOst77oXnrzFhQkM=; b=Vi+JwCEIWkH5Z7Oh1n+MQ6j9RLUHllI0DJUwe4p5EMJfk6qTFLHjox7yeg2O28sZ4ng8yS 1tFC9I8i2NAvZeAZuDjq8RPCqe71VtXU0Efv/ce2HTCVkxuyeCDGkY9a0q3ULRLnYtw91v r3yVUSbfjCiiWCIb7TXqfAapCzZux6L40QRvMSNGTogmO8u9voSqoG1GLJnFB9sb6FGeZ3 A+J16UYqeblUk7r4QqEJE11xFXXRI3lhXK3E3tYqa8Gc76HiPfA5jfTwKOueGoh6ORczlu H1HMb6qFf8Ul/QuQNEyJj2dbNjFW+gbpQeffYnCktDvvkBvVXsFlMWBL/W8Siw== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=greghogan-com.20230601.gappssmtp.com header.s=20230601 header.b="A0zdQGq/"; 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-Seal: i=1; s=key1; d=yhetil.org; t=1711551275; a=rsa-sha256; cv=none; b=HLEHIoC7tZnsTbPG3qn64rjkuV4uGK1RLPpSlTN95Et6fPzep1EWGBRifbNeJw1yrRaxyN nfaYLEw3eYOjwJZ/cF7LOHqqjy27gktPjxGjGCwcpKIHKtbfhvC6DgB93wsS+KVCcZf4W0 laPonHYF4txU4BK/9RY76cMS7enrvAOYyWsHrSRsxnsfHEPtZp3a16C0lYNGCnXWqBxQ3f TL+CigK+FUIKu7vCKOU2rqLk26hD9/ppgflqRhVkURsklLoUF2Udbo+0Pd1iCey8/jMZ24 grouKJkFVVLMPaQvbmoA7u1E6Rh2uPHlEEfV12w/s7gzedZ7sSAsylavw6MMIA== 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 E331F39DB4 for ; Wed, 27 Mar 2024 15:54:35 +0100 (CET) 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 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-Country: US X-Migadu-Flow: FLOW_IN X-Spam-Score: -0.85 X-Migadu-Queue-Id: E331F39DB4 X-Migadu-Scanner: mx13.migadu.com X-Migadu-Spam-Score: -0.85 X-TUID: VXzew6pEwQpN * 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))) -- 2.44.0