From patchwork Fri Apr 21 20:49:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 49360 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 50F7227BBE9; Fri, 21 Apr 2023 21:51:16 +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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 2336C27BBE2 for ; Fri, 21 Apr 2023 21:51:14 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppxii-0002io-Vb; Fri, 21 Apr 2023 16:51: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 1ppxih-0002iH-Dm for guix-patches@gnu.org; Fri, 21 Apr 2023 16:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppxig-0004ee-R8 for guix-patches@gnu.org; Fri, 21 Apr 2023 16:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ppxig-0004mF-ML for guix-patches@gnu.org; Fri, 21 Apr 2023 16:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63004] [PATCH 1/2] build-system/cmake: Add support for the #:disallowed-references key. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Apr 2023 20:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 63004@debbugs.gnu.org Received: via spool by 63004-submit@debbugs.gnu.org id=B63004.168211021018256 (code B ref 63004); Fri, 21 Apr 2023 20:51:02 +0000 Received: (at 63004) by debbugs.gnu.org; 21 Apr 2023 20:50:10 +0000 Received: from localhost ([127.0.0.1]:41267 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppxhq-0004kJ-3h for submit@debbugs.gnu.org; Fri, 21 Apr 2023 16:50:10 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:40845) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppxhn-0004jt-T0 for 63004@debbugs.gnu.org; Fri, 21 Apr 2023 16:50:08 -0400 Received: from compute2.internal (compute2.nyi.internal [10.202.2.46]) by mailout.nyi.internal (Postfix) with ESMTP id CD72C5C00A9; Fri, 21 Apr 2023 16:50:02 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute2.internal (MEProxy); Fri, 21 Apr 2023 16:50:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:message-id:mime-version:reply-to:sender:subject :subject:to:to; s=mesmtp; t=1682110202; x=1682196602; bh=zQx6C6W Cu9dXdYxC3COulMIcXzJHX6+UR0+j6nb5pw8=; b=aKbuWqpt4a3XXSnxi95Zb20 a4TqChEzf5FE8xGuS0JuKAOi4ZV4dhTqNNmqsWHv3mefn0ISatyUJyEcTvo6p+uq JMzCHhSp+mppAnG4IKwcIYtyui4BbUEGg+4SShiE2AEvrvWh9TCNYmle0/z7Ss8q xKwosnCkKXkkhuBfet6A= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :message-id:mime-version:reply-to:sender:subject:subject:to:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm3; t=1682110202; x=1682196602; bh=zQx6C6WCu9dXdYxC3COulMIcXzJH X6+UR0+j6nb5pw8=; b=dHtm6+jXtO1YKnnWDDSUSt4lU/rMjrQZadiAErjY3jy8 PzM7+WkroPExSOZ9dSF4j4K5/4J40HF9PYwd69b6kSEaZEOXBoPnhKrgY/50PYBB 43gi/abv/CyheZiL1a8SRV0hYP8Pb1z1vW9Dr3QkG1J0jHoFqx8wj0k1MDMU8Va6 1kVC9kItMl4/I3j9Z4cI11QU+RejFq0zna9ftyb9CIvKCFhf9pRBOpnNiXQIKf4r h/IRAmNRwfs5yBJmc9a8l15ZdV/bb+6Jjw9wzASCW5iMyJmRBQuPp7rJhn5uxUTW bIgmwiV3XqI/V5AxBwaFFXOdzVwWUfSwz5sMa+HguA== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedtgedgudehvdcutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeetueeigfelheekveffveetffeugeeuud dvgeeiffevkeeuffefteduvdfhhfduhfenucevlhhushhtvghrufhiiigvpedtnecurfgr rhgrmhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <63004@debbugs.gnu.org>; Fri, 21 Apr 2023 16:50:02 -0400 (EDT) From: Leo Famulari Date: Fri, 21 Apr 2023 16:49:57 -0400 Message-Id: <32e4684cb2a52c963e84485e53e2680f25f2eddf.1682110198.git.leo@famulari.name> X-Mailer: git-send-email 2.39.2 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 (cmake-build, cmake-cross-build): Add #:disallowed-references. --- guix/build-system/cmake.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/guix/build-system/cmake.scm b/guix/build-system/cmake.scm index 09e3ac85db..ed979b9c6b 100644 --- a/guix/build-system/cmake.scm +++ b/guix/build-system/cmake.scm @@ -116,7 +116,8 @@ (define* (cmake-build name inputs (substitutable? #t) (imported-modules %cmake-build-system-modules) (modules '((guix build cmake-build-system) - (guix build utils)))) + (guix build utils))) + disallowed-references) "Build SOURCE using CMAKE, and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." (define build @@ -158,6 +159,7 @@ (define build #:target #f #:graft? #f #:substitutable? substitutable? + #:disallowed-references disallowed-references #:guile-for-build guile))) @@ -193,7 +195,8 @@ (define* (cmake-cross-build name (build (nix-system->gnu-triplet system)) (imported-modules %cmake-build-system-modules) (modules '((guix build cmake-build-system) - (guix build utils)))) + (guix build utils))) + disallowed-references) "Cross-build NAME using CMAKE for TARGET, where TARGET is a GNU triplet and with INPUTS. This assumes that SOURCE provides a 'CMakeLists.txt' file as its build system." From patchwork Fri Apr 21 20:49:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 49361 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 8EEA227BBE9; Fri, 21 Apr 2023 21:51: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=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED 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 E77F527BBE2 for ; Fri, 21 Apr 2023 21:51:22 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ppxik-0002it-5a; Fri, 21 Apr 2023 16:51:06 -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 1ppxih-0002iI-6w for guix-patches@gnu.org; Fri, 21 Apr 2023 16:51:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ppxig-0004eb-Tu for guix-patches@gnu.org; Fri, 21 Apr 2023 16:51:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ppxig-0004m5-AG for guix-patches@gnu.org; Fri, 21 Apr 2023 16:51:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#63004] [PATCH 2/2] gnu: ldc-bootstrap: Don't depend on tzdata. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 21 Apr 2023 20:51:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 63004 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: To: 63004@debbugs.gnu.org Received: via spool by 63004-submit@debbugs.gnu.org id=B63004.168211021018250 (code B ref 63004); Fri, 21 Apr 2023 20:51:02 +0000 Received: (at 63004) by debbugs.gnu.org; 21 Apr 2023 20:50:10 +0000 Received: from localhost ([127.0.0.1]:41265 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppxhp-0004kG-PT for submit@debbugs.gnu.org; Fri, 21 Apr 2023 16:50:10 -0400 Received: from out5-smtp.messagingengine.com ([66.111.4.29]:45949) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ppxho-0004ju-75 for 63004@debbugs.gnu.org; Fri, 21 Apr 2023 16:50:08 -0400 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 2781F5C01B0; Fri, 21 Apr 2023 16:50:03 -0400 (EDT) Received: from mailfrontend1 ([10.202.2.162]) by compute1.internal (MEProxy); Fri, 21 Apr 2023 16:50:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=cc:content-transfer-encoding:content-type:date:date:from:from :in-reply-to:in-reply-to:message-id:mime-version:references :reply-to:sender:subject:subject:to:to; s=mesmtp; t=1682110203; x=1682196603; bh=X4GWGRq4OXKLfryo/YBvucBzQQ7pa0RIpuyOs7Px27c=; b= wzOJRrU7iATBczMCMU91DzSvS4rLmVnDGFEvZrOm0BfhMcgbNfMuQdHfUNthAodj 6LDrHJz3MtMsyUAxuxSUPWUuvwOstr3qSkqiJi6hZAWtTN1gYJz8wfA7furdqnAH djG1HuPiYUCIQSh/QlD5kETXSd9+FlH2Ni9JvSQcg5c= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:content-transfer-encoding:content-type :date:date:feedback-id:feedback-id:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to:x-me-proxy:x-me-proxy:x-me-sender :x-me-sender:x-sasl-enc; s=fm3; t=1682110203; x=1682196603; bh=X 4GWGRq4OXKLfryo/YBvucBzQQ7pa0RIpuyOs7Px27c=; b=WmDEi2IaqVnEDzQ2v d4HaC65Amdf4w6ffvG44m086TGV6TA1Hq2glmBGzhnp2YiMtDrnGx+j4meZNNYtw bSIPmhNvSI9nQu3zjcCt6TSU2USl/a006WpbehCDA+yexHJVEku0khpSBwzMckJh CMnatHQi33gknSoLcdj46hKQiVzOXMvgEypyV5/CvlcOJoYj1+Tr0p3ZtFE19Ok8 bRfgRXCsR8hEKTN/8JYi3X1IMoO87gEHRMC9iLoOindjqt5TGa+BlvAC1KYsj1vm BEaIA7p49geFu3PdxUmhsHptDUfzrQ1NFjE8df9rRgXNtf3Q2laDVZ69USqvb7oR CGgxg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvhedrfedtgedgudehfecutefuodetggdotefrod ftvfcurfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfgh necuuegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtke ertdertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhl rghrihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpeeggefhkeeukefhjeejjeeggeffff efuedtveegffekhfegjedvleejfeefieekjeenucffohhmrghinhepughlrghnghdrohhr ghenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgrmhepmhgrihhlfhhrohhmpehlvg hosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Feedback-ID: i819c4023:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA for <63004@debbugs.gnu.org>; Fri, 21 Apr 2023 16:50:02 -0400 (EDT) From: Leo Famulari Date: Fri, 21 Apr 2023 16:49:58 -0400 Message-Id: <8ba08c4d2a7948431e72cd32466b1526fed35f56.1682110198.git.leo@famulari.name> X-Mailer: git-send-email 2.39.2 In-Reply-To: <32e4684cb2a52c963e84485e53e2680f25f2eddf.1682110198.git.leo@famulari.name> References: <32e4684cb2a52c963e84485e53e2680f25f2eddf.1682110198.git.leo@famulari.name> 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 * gnu/packages/dlang.scm (ldc-bootstrap)[inputs]: Remove tzdata. [native-inputs]: Add tzdata-for-tests. [arguments]: Forbid references to tzdata-for-tests. --- gnu/packages/dlang.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/dlang.scm b/gnu/packages/dlang.scm index 729d6015ae..eafc0a7bbf 100644 --- a/gnu/packages/dlang.scm +++ b/gnu/packages/dlang.scm @@ -159,7 +159,8 @@ (define ldc-bootstrap (base32 "1kfs4fpr1525sv2ny10hlfppy8c075vjm8m649wr2b9411pkgfzx")))) (build-system cmake-build-system) (arguments - `(#:tests? #f ;skip in the bootstrap + `(#:disallowed-references (,tzdata-for-tests) + #:tests? #f ;skip in the bootstrap #:build-type "Release" #:configure-flags (list "-GNinja") @@ -187,7 +188,6 @@ (define ldc-bootstrap (inputs `(("libconfig" ,libconfig) ("libedit" ,libedit) - ("tzdata" ,tzdata) ("zlib" ,zlib))) (native-inputs `(("lld-wrapper" ,(make-lld-wrapper lld-11 #:lld-as-ld? #t)) @@ -195,6 +195,7 @@ (define ldc-bootstrap ("ldc" ,gdmd) ("ninja" ,ninja) ("python-wrapper" ,python-wrapper) + ("tzdata" ,tzdata-for-tests) ("unzip" ,unzip))) (home-page "http://wiki.dlang.org/LDC") (synopsis "LLVM-based compiler for the D programming language")