From patchwork Wed Mar 27 14:52:29 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Hogan X-Patchwork-Id: 62280 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 376D727BBEA; Wed, 27 Mar 2024 14:54:19 +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=ham 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 C795727BBE2 for ; Wed, 27 Mar 2024 14:54:18 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rpUfF-0000x3-Gs; Wed, 27 Mar 2024 10:54:05 -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 1rpUfE-0000vl-0C for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:04 -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 1rpUfD-0008Jz-Nj for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rpUfD-0000qg-N7 for guix-patches@gnu.org; Wed, 27 Mar 2024 10:54:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#70031] [core-updates PATCH 04/19] build-system/cmake: Add install. Resent-From: Greg Hogan Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 27 Mar 2024 14:54:03 +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.17115512143094 (code B ref 70031); Wed, 27 Mar 2024 14:54:03 +0000 Received: (at 70031) by debbugs.gnu.org; 27 Mar 2024 14:53:34 +0000 Received: from localhost ([127.0.0.1]:38115 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUek-0000np-03 for submit@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:34 -0400 Received: from mail-oi1-x235.google.com ([2607:f8b0:4864:20::235]:52535) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rpUeZ-0000lN-3g for 70031@debbugs.gnu.org; Wed, 27 Mar 2024 10:53:23 -0400 Received: by mail-oi1-x235.google.com with SMTP id 5614622812f47-3c38eced701so4049462b6e.1 for <70031@debbugs.gnu.org>; Wed, 27 Mar 2024 07:53:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=greghogan-com.20230601.gappssmtp.com; s=20230601; t=1711551197; x=1712155997; 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=C2oAISZ8QsDvj+9rCLABGnZkS0Rkq9UaeaIKtHIDjiY=; b=GYhc8tbDXtky36NQNV5sudo7wXrwBgMrZt1zi4lpx498RKng5dNJxYQgvL9zYHzuP2 joieM5VhgfJFCb1+zb6wis5y1H/VSsZSjO8kOU5vavR918H99joKwgLZjwerQyo3Rceh SynKdDlDwlpLabyO2B+PhVzF2dXEOxKA3IAFFu4bh4sLzEl632meTmijF480o/IKOovW UuJ95UTMOxE4gSLiC5EnzZnKH+oyfXbAGXwX43wJPcfT6hFXp4oUVUCRYqpc5wQkta8C kDDW+j4wR4AXVh9ZayFxWZVAOSbzvgZMmkdhK95ENqB6qiFzBS/WSZs+3RG7thCWJxDS R/IQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711551197; x=1712155997; 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=C2oAISZ8QsDvj+9rCLABGnZkS0Rkq9UaeaIKtHIDjiY=; b=dQtoBiJrTj04FLH0T5lvrkfBdsXL65mfz9c+XhwA0aKZhcqe0W4FQpSBeaCoEa1HVn wnkrndxipnHXhNYFqEZdO/lnnS1FIPuwSY+sCQTEwMBtMPcw2H9pgiyyv5scjoQW5kdL QR8C8MCg2Otw+Ahks28AOKoStn5f72kib00+yjVgv0a9ZtdJunWZtWcWZiR8eGs8sjkc crnd8P1pUN+lLdu+qYkcpu4nT2ApvhxSQ8WxaCEyfIsAtpwy0IDpZWUgj4uQy9eUUHET A8DzcaWJ5I3/ZA8Z4f5cS+K+WT86wmm4ay6sMQIdXhOH8kiGyyYu3GD8yyv3MgWi9Gvl 1pqw== X-Gm-Message-State: AOJu0YwffBpCOTP/o5+3mPWu2BSTYXpZ/CeyTli4oV9mU/+yEj6SVVLC IufTSz5cA63wwHZ8WjTu38WPtRFEpCa2V9+seTVRwQgDq97/4s4nWv2LnSWCeD2x0VnP27FbT09 R X-Google-Smtp-Source: AGHT+IFdQBnEcYBN3LOaoW7aIus5P5cvorCRV3SAZ2tXeq5PKRXDq3L4xjKglraMqpLSdhxVhX8GJw== X-Received: by 2002:a05:6808:1383:b0:3c3:62c1:e4c9 with SMTP id c3-20020a056808138300b003c362c1e4c9mr194788oiw.2.1711551197059; Wed, 27 Mar 2024 07:53:17 -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.16 (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:29 +0000 Message-ID: <4e4097bdce2d41c010f6300b725c492e95b8a5c9.1711549374.git.code@greghogan.com> 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 make install with the cmake install command. --- guix/build/cmake-build-system.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/guix/build/cmake-build-system.scm b/guix/build/cmake-build-system.scm index 8f1c80aeb64..c3e095425f9 100644 --- a/guix/build/cmake-build-system.scm +++ b/guix/build/cmake-build-system.scm @@ -109,12 +109,16 @@ (define* (check #:key (tests? #t) (parallel-tests? #t) '())))) (format #t "test suite not run~%"))) +(define* (install #:rest args) + (invoke "cmake" "--install" ".")) + (define %standard-phases (modify-phases gnu:%standard-phases (delete 'bootstrap) (replace 'build build) (replace 'check check) - (replace 'configure configure))) + (replace 'configure configure) + (replace 'install install))) (define* (cmake-build #:key inputs (phases %standard-phases) #:allow-other-keys #:rest args)