From patchwork Tue Apr 29 15:31:37 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Maxim Cournoyer X-Patchwork-Id: 42147 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 607F727BC4B; Tue, 29 Apr 2025 16:33:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-6.4 required=5.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FROM,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_VALIDITY_CERTIFIED,RCVD_IN_VALIDITY_RPBL, RCVD_IN_VALIDITY_SAFE,SPF_HELO_PASS,URIBL_BLOCKED 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 D8F7C27BC49 for ; Tue, 29 Apr 2025 16:33:23 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1u9mxM-0002ez-IQ; Tue, 29 Apr 2025 11:33:12 -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 1u9mxJ-0002eE-5f for guix-patches@gnu.org; Tue, 29 Apr 2025 11:33:09 -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 1u9mxI-0006GI-QA for guix-patches@gnu.org; Tue, 29 Apr 2025 11:33:08 -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:Date:From:To:In-Reply-To:References:Subject; bh=nSXfXjEHKF6UtXz6io7MhJLBtSGZH6EB4wmo4caJETQ=; b=OmB7/dUMBzjIRGR0iqJA9EX44gP/HX6qEuQWgNC4ED6a8mBHJDOs1sJTCayDcXB7C01naYtTjPtJqGlJEPPmpTS5ErmZKff2w+qfOlnxHZDMP0QBrd833emukfG2KTfdsoo6Jv7rBWVE9p2yRm0dR8LlS8jeFNqgjsBgsrKzCumCVf3NSIIlU28LtqdIAO4ZWicCNxYehNtmwbHYCpGTpoSfW/1kwxyR9EE+jVB5pMHBGZos8jmlGeyTYxzY7b/2VRfUAWoV/NamsZet0bOuPl3SYQpAiON/Ip+ZviNm8WuHIx7Tg2yZpu4urBa862nT5umztVElfIlqDkY1USNbEA==; Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1u9mxG-0006Og-IA; Tue, 29 Apr 2025 11:33:06 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#78102] [PATCH v2 1/3] build/cmake: Add #:implicit-inputs? and #:implicit-cross-inputs? arguments. References: <9966a347ee398a118b13a1febfcf62d7f77d0cc8.1745808541.git.maxim.cournoyer@gmail.com> In-Reply-To: <9966a347ee398a118b13a1febfcf62d7f77d0cc8.1745808541.git.maxim.cournoyer@gmail.com> Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: maxim.cournoyer@gmail.com, gabriel@erlikon.ch, guix-patches@gnu.org Resent-Date: Tue, 29 Apr 2025 15:33:06 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 78102 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 78102@debbugs.gnu.org Cc: Maxim Cournoyer , Maxim Cournoyer , Gabriel Wicki X-Debbugs-Original-Xcc: Maxim Cournoyer , Gabriel Wicki Received: via spool by 78102-submit@debbugs.gnu.org id=B78102.174594073124182 (code B ref 78102); Tue, 29 Apr 2025 15:33:06 +0000 Received: (at 78102) by debbugs.gnu.org; 29 Apr 2025 15:32:11 +0000 Received: from localhost ([127.0.0.1]:58135 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1u9mwM-0006Hx-N0 for submit@debbugs.gnu.org; Tue, 29 Apr 2025 11:32:11 -0400 Received: from mail-pf1-x431.google.com ([2607:f8b0:4864:20::431]:48419) by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.84_2) (envelope-from ) id 1u9mwI-0006Gv-4M for 78102@debbugs.gnu.org; Tue, 29 Apr 2025 11:32:06 -0400 Received: by mail-pf1-x431.google.com with SMTP id d2e1a72fcca58-7396f13b750so6804206b3a.1 for <78102@debbugs.gnu.org>; Tue, 29 Apr 2025 08:32:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1745940719; x=1746545519; darn=debbugs.gnu.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=nSXfXjEHKF6UtXz6io7MhJLBtSGZH6EB4wmo4caJETQ=; b=fulxbc5eF7dW8/+7nZv9bg9JAztkxV+GDWJjgpn+piyigjl89NF3xgF+TfsRmEaGOS IT9ZJdvRJLt6zij5AwJ2nFTvIFnUY6uS1AHD4QVbVJchkFO1WBZCSqNogWHTKIPOfv93 oeJi0loY+xzGh2mu9iVQAV6vWIegXmqKTUs63BmQ3m5D1gZFp3sCSopohgWY+iauUq+q hQern25SELu2iKtHzUFUsTa+UOmqjqZecgGG6dUdhmkiXn+OdvWkyL6aFKNW4mVDIpqs jIaURTFfYfdaNnUy1Il4kgahPId61PCRbe9az2kUWsUAaAo0SskvKnf6nu66NhAXPZMm dfCw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1745940719; x=1746545519; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=nSXfXjEHKF6UtXz6io7MhJLBtSGZH6EB4wmo4caJETQ=; b=sfBq9WI+/m1Ea7aRyjLHc8xHii3WlzQHD2NpVHOykHsw3yqqzFGmZ5ilGAiIKn9fFB tTFzJXPfykyqqN47ZhF7zoNTbzMpTjEf6EzrsLh+3lWByDAN8WasBPPS/izKc3kt0kxS lUfndOvJV3P0I+pY153moYEcYuS5jviJfwIz8k+tIq3uUwZfSlH0oHF2cAQO8LW2X7Xd vo8ugY+tUSGSlABwyLvOhA4L+tAuQMdZac11n3FvJbmX8/rV0fIAOxrh68uOILK/+NRf B1jCsLJZyEZy7hXufAqYRKh1YRZD7WMddk3MM6knh7ZBfVnXz2g2o7YwA5XyovCW98Ow TXgQ== X-Gm-Message-State: AOJu0YwoTESJfr6KuPO0R0T+J8yNeSJ2HD6i1/22vpytUKlKHclzlPZ7 nr0LjwwHv/JqiHbH++aKCof+1H5DHc9Tw19ObuPN7a4pYCRn6DpP/HM+7A== X-Gm-Gg: ASbGncuU2DkLkJYer+RnAwoQCHpiq4d3cnb+Miw5SuW48xGsT6mOYMNEcnLl6kXQ+SF E5thT04GqzfqBdExfsEf5SZv1z4Y/10JH/TCsjC/67uBDPG2jffoOl8drZ8b8BcJyVnrIJ+R0sp 3r9iYx2LggXJcJIFjDuRIpkeaiAnzKkSJLCRJ8UNm1pAb6pp5kpnyW5NJl7aWsguvgm7//Qm/Km 6vP0pqcOOCw0bZ+4vZS4ikve1NQtzI1GcIuKBR3LRRxUklIGOyN6J6Y/AYQaTJTyUt/epzStKVq qftPUQ9ynWQ3t7OvB33gmJPKY2SvrOmOh1E68jDjkGVtsp0nJ9jJVpThpq68QYIIBhnaqTY= X-Google-Smtp-Source: AGHT+IG2Q0MGB5MjWOAw2omTchVGzmLroCVG2hNjn6w903qtWem4Km3d2ywNjw21NbkS2+Dks/24Yg== X-Received: by 2002:a05:6a00:1942:b0:736:a8db:93b8 with SMTP id d2e1a72fcca58-7402925e549mr4869370b3a.3.1745940719210; Tue, 29 Apr 2025 08:31:59 -0700 (PDT) Received: from localhost.localdomain ([2405:6586:be0:0:83c8:d31d:2cec:f542]) by smtp.gmail.com with ESMTPSA id d2e1a72fcca58-73e25a6a420sm10303533b3a.107.2025.04.29.08.31.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 29 Apr 2025 08:31:57 -0700 (PDT) From: Maxim Cournoyer Date: Wed, 30 Apr 2025 00:31:37 +0900 Message-ID: <7e9be31603f35d063e9568fe7650be901e671951.1745940699.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.49.0 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-system/cmake.scm (lower) <#:implicit-inputs?> <#:implicit-cross-inputs?>: New arguments. Change-Id: I1f077f78f5836ce325827e7ef8d58ba554a8ed4f --- guix/build-system/cmake.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) base-commit: 2b4680c6c17bd6470f78a1f39d2f7af8b05e279f diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 9d757c0d061..8b1889e36bc 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -3,6 +3,7 @@ ;;; Copyright © 2013 Cyril Roelandt ;;; Copyright © 2017 Ricardo Wurmus ;;; Copyright © 2020 Efraim Flashner +;;; Copyright © 2025 Maxim Cournoyer ;;; ;;; This file is part of GNU Guix. ;;; @@ -65,12 +66,14 @@ (define (default-cmake target) (define* (lower name #:key source inputs native-inputs outputs system target + (implicit-inputs? #t) (implicit-cross-inputs? #t) (cmake (default-cmake target)) #:allow-other-keys #:rest arguments) "Return a bag for NAME." (define private-keywords `(#:cmake #:inputs #:native-inputs + #:implicit-inputs? #:implicit-cross-inputs? ,@(if target '() '(#:target)))) (bag @@ -83,13 +86,15 @@ (define* (lower name ,@`(("cmake" ,cmake)) ,@native-inputs ,@(if target '() inputs) - ,@(if target + ,@(if (and target implicit-cross-inputs?) ;; Use the standard cross inputs of ;; 'gnu-build-system'. (standard-cross-packages target 'host) '()) ;; Keep the standard inputs of 'gnu-build-system'. - ,@(standard-packages))) + ,@(if implicit-inputs? + (standard-packages system) + '()))) (host-inputs (if target inputs '())) ;; The cross-libc is really a target package, but for bootstrapping @@ -97,7 +102,7 @@ (define* (lower name ;; native package, so it would end up using a "native" variant of ;; 'cross-libc' (built with 'gnu-build'), whereas all the other packages ;; would use a target variant (built with 'gnu-cross-build'.) - (target-inputs (if target + (target-inputs (if (and target implicit-cross-inputs?) (standard-cross-packages target 'target) '())) (outputs outputs)