From patchwork Sat Nov 27 23:32:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 34838 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 4995527BBEA; Sat, 27 Nov 2021 23:33:12 +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=-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 2015127BBE9 for ; Sat, 27 Nov 2021 23:33:12 +0000 (GMT) Received: from localhost ([::1]:58742 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mr7Bv-00010n-9A for patchwork@mira.cbaines.net; Sat, 27 Nov 2021 18:33:11 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57880) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mr7Bm-00010W-Sg for guix-patches@gnu.org; Sat, 27 Nov 2021 18:33:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51379) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mr7Bm-0001yk-KD for guix-patches@gnu.org; Sat, 27 Nov 2021 18:33:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mr7Bm-00041L-H5 for guix-patches@gnu.org; Sat, 27 Nov 2021 18:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51198] [PATCH v2 1/2] build-system/gnu: Add #:local-build? parameter. References: In-Reply-To: Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Nov 2021 23:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51198@debbugs.gnu.org Received: via spool by 51198-submit@debbugs.gnu.org id=B51198.163805597515429 (code B ref 51198); Sat, 27 Nov 2021 23:33:02 +0000 Received: (at 51198) by debbugs.gnu.org; 27 Nov 2021 23:32:55 +0000 Received: from localhost ([127.0.0.1]:34690 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mr7Be-00040m-LC for submit@debbugs.gnu.org; Sat, 27 Nov 2021 18:32:54 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:42039) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mr7Bc-00040M-Sj for 51198@debbugs.gnu.org; Sat, 27 Nov 2021 18:32:53 -0500 Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.west.internal (Postfix) with ESMTP id 088603200904; Sat, 27 Nov 2021 18:32:45 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sat, 27 Nov 2021 18:32:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; s=mesmtp; bh=h98TlDSRaUhbKD5ElVfDfRW J1hdoa8U7bqWuCAnRPNk=; b=qlEhyP2l2hFltzjtRvVMBiCL58h2RMHWWePxSBD tauOuuyupY1p9xnwybdcJQXFKObODTt8pctE0l7w/aIH63BAsVpHiBgc0ubvP9He hgH8IBYXYn3pgPZgc4y07fUL4eAQPLIUuy/Uv6kHwoEU/tY06qjrnbSohnZQ6vbc Cb8Y= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :message-id:mime-version:subject:to:x-me-proxy:x-me-proxy :x-me-sender:x-me-sender:x-sasl-enc; s=fm1; bh=h98TlDSRaUhbKD5El VfDfRWJ1hdoa8U7bqWuCAnRPNk=; b=i0JRotGEPtbbtraXI1fZz6PA8xFhqai97 gxCElECJWl2/hkC75c4p2FxbSSqpY2E9iv3vgu2ntl4aQZXYPdcohwSMVLSpH3HL zYJ87+LPCUa2KVO+ZaPOVXz6rE6kbgkhRrZnpCujjpINzyZ3Kaqp46p3stZwvg1W eDe+nnXi3SbFjgoSf9bl8w8ZZ/pdVsj0D9pcmbj57Pp7LA8AnvxZTkU+H4coWN// QFaBrhSVyca1BR7XozyafQ5I3Nf+srSgA/iLnoYQ3XOMKPr/G9kt4nCSPpbv30BC pFCCWc/FigKlNbXVSGVoIog69XqwwcZ/PE3gfhWCpy86e+feq5lZg== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrheehgdduudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffoggfgsedtkeertdertd dtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghrihdr nhgrmhgvqeenucggtffrrghtthgvrhhnpeetueeigfelheekveffveetffeugeeuuddvge eiffevkeeuffefteduvdfhhfduhfenucevlhhushhtvghrufhiiigvpedtnecurfgrrhgr mhepmhgrihhlfhhrohhmpehlvghosehfrghmuhhlrghrihdrnhgrmhgv X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <51198@debbugs.gnu.org>; Sat, 27 Nov 2021 18:32:45 -0500 (EST) From: Leo Famulari Date: Sat, 27 Nov 2021 18:32:37 -0500 Message-Id: X-Mailer: git-send-email 2.33.1 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" X-getmail-retrieved-from-mailbox: Patches * guix/build-system/gnu.scm (gnu-build, gnu-cross-build): Add #:local-build? parameter and pass it to 'build-expression->derivation'. --- guix/build-system/gnu.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/guix/build-system/gnu.scm b/guix/build-system/gnu.scm index 6b481ad45c..fc923f0c5a 100644 --- a/guix/build-system/gnu.scm +++ b/guix/build-system/gnu.scm @@ -349,6 +349,7 @@ (define* (gnu-build store name input-drvs (build (nix-system->gnu-triplet system)) (imported-modules %gnu-build-system-modules) (modules %default-modules) + (local-build? #f) (substitutable? #t) allowed-references disallowed-references) @@ -429,6 +430,7 @@ (define guile-for-build #:inputs input-drvs #:outputs outputs #:modules imported-modules + #:local-build? local-build? #:substitutable? substitutable? #:allowed-references @@ -504,6 +506,7 @@ (define* (gnu-cross-build store name (build (nix-system->gnu-triplet system)) (imported-modules %gnu-build-system-modules) (modules %default-modules) + (local-build? #f) (substitutable? #t) allowed-references disallowed-references) @@ -595,6 +598,7 @@ (define guile-for-build #:inputs (append native-drvs target-drvs) #:outputs outputs #:modules imported-modules + #:local-build? local-build? #:substitutable? substitutable? #:allowed-references From patchwork Sat Nov 27 23:32:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leo Famulari X-Patchwork-Id: 34839 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 E107427BBEA; Sat, 27 Nov 2021 23:33:15 +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=-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 A499D27BBE9 for ; Sat, 27 Nov 2021 23:33:15 +0000 (GMT) Received: from localhost ([::1]:58882 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mr7By-00016E-SG for patchwork@mira.cbaines.net; Sat, 27 Nov 2021 18:33:14 -0500 Received: from eggs.gnu.org ([209.51.188.92]:57882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mr7Bn-00010e-Id for guix-patches@gnu.org; Sat, 27 Nov 2021 18:33:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51380) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mr7Bn-0001yq-6V for guix-patches@gnu.org; Sat, 27 Nov 2021 18:33:03 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mr7Bm-00041T-Tn for guix-patches@gnu.org; Sat, 27 Nov 2021 18:33:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#51198] [PATCH v2 2/2] gnu: b2sum: Build on the local machine. Resent-From: Leo Famulari Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sat, 27 Nov 2021 23:33:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51198 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51198@debbugs.gnu.org Received: via spool by 51198-submit@debbugs.gnu.org id=B51198.163805597515436 (code B ref 51198); Sat, 27 Nov 2021 23:33:02 +0000 Received: (at 51198) by debbugs.gnu.org; 27 Nov 2021 23:32:55 +0000 Received: from localhost ([127.0.0.1]:34692 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mr7Be-00040o-Tc for submit@debbugs.gnu.org; Sat, 27 Nov 2021 18:32:55 -0500 Received: from wout4-smtp.messagingengine.com ([64.147.123.20]:44125) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mr7Bd-00040P-5S for 51198@debbugs.gnu.org; Sat, 27 Nov 2021 18:32:53 -0500 Received: from compute3.internal (compute3.nyi.internal [10.202.2.43]) by mailout.west.internal (Postfix) with ESMTP id 6F57D320091A; Sat, 27 Nov 2021 18:32:47 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute3.internal (MEProxy); Sat, 27 Nov 2021 18:32:47 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=famulari.name; h=from:to:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; s=mesmtp; bh=YQJO7n46BA jhMG1bNbgyNmfWUOLYsKrhvQExfUgpIp8=; b=Qj6m/7f1xxTEmn46MarpqK3JJN SLRCj1lDtDykuuJcaaOppIqNskUjEll9RJcrVT0LW6diOtls1djjWb3ubl+A+o4F ekKp+o0QTIb6G3x9QwzfrCIEEkY4SXKKgJLl1GDzyHZTGfWAnP5OcFaBq6ALQ5UN 3M/4kwxOYGSr2lM4Q= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=content-transfer-encoding:date:from :in-reply-to:message-id:mime-version:references:subject:to :x-me-proxy:x-me-proxy:x-me-sender:x-me-sender:x-sasl-enc; s= fm1; bh=YQJO7n46BAjhMG1bNbgyNmfWUOLYsKrhvQExfUgpIp8=; b=DkM31fPL +KX6EaIj6w8v4Uqsg++jT4FhW0LI7tQ1VISWpr2ojl6YxbS8ajX9DirElwcIw2jl zn6ePUF2CV5kdx5wm0JS99qxm1j+Lq+BqaAChCuy9EueoWQSSqXf4Ffifi0Y1qX0 xohV9XSSag0WCXemIHIYtemcwGMEQE2fyAlPEJEmeNt0pVpUYlJp3zz0OYpuLILw yuSCFiRdRaidh4cOKVo9ST5k37SN5EQ/lfWmEgUQOsroW1aBreezGMbHRZmoExUx hBxN6nKN47E4wi8HnMOq102LAirdDqJdToCdNB/NOf8bBXBjcBbeWBanvYyXD+pE T4BZBL19tDcOzw== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvuddrheehgdduudcutefuodetggdotefrodftvf curfhrohhfihhlvgemucfhrghsthforghilhdpqfgfvfdpuffrtefokffrpgfnqfghnecu uegrihhlohhuthemuceftddtnecunecujfgurhephffvufffkffojghfggfgsedtkeertd ertddtnecuhfhrohhmpefnvghoucfhrghmuhhlrghrihcuoehlvghosehfrghmuhhlrghr ihdrnhgrmhgvqeenucggtffrrghtthgvrhhnpedtffejjeeuudehueetheeivddviedtie egtedvudejjeeltdehfffhhedtheeltdenucffohhmrghinhepghhithhhuhgsrdgtohhm pdhgnhhurdhorhhgnecuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilh hfrhhomheplhgvohesfhgrmhhulhgrrhhirdhnrghmvg X-ME-Proxy: Received: by mail.messagingengine.com (Postfix) with ESMTPA for <51198@debbugs.gnu.org>; Sat, 27 Nov 2021 18:32:46 -0500 (EST) From: Leo Famulari Date: Sat, 27 Nov 2021 18:32:38 -0500 Message-Id: <0a0f14aab09280676f078f3df5eeef44b019760d.1638055958.git.leo@famulari.name> X-Mailer: git-send-email 2.33.1 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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/crypto.scm (b2sum)[arguments]: Set '#:substitutable? #f' and '#:local-build? #t'. --- gnu/packages/crypto.scm | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/gnu/packages/crypto.scm b/gnu/packages/crypto.scm index b6f2010a80..d4c6717eb5 100644 --- a/gnu/packages/crypto.scm +++ b/gnu/packages/crypto.scm @@ -858,9 +858,19 @@ (define-public b2sum (base32 "04z631v0vzl52g73v390ask5fnzi5wg83lcjkjhpmmymaz0jn152")))) (build-system gnu-build-system) (arguments - `(#:make-flags (list (string-append "CC=" ,(cc-for-target)) - (string-append "PREFIX=" (assoc-ref %outputs "out"))) + `(;; By default, b2sum uses the compiler to generate instructions + ;; tailored to the CPU of the running machine, using "-march=native". + ;; This gives a ~1.5x speedup on a Core i5-6300U with a large dataset + ;; paged in, whereas compilation of b2sum takes ~1.5 seconds. + ;; b2sum does not support run-time feature detection: + ;; https://github.com/BLAKE2/BLAKE2/issues/1 + ;; For more information, see the discussion beginning here: + ;; https://debbugs.gnu.org/cgi/bugreport.cgi?bug=51198#13 + #:substitutable? #f + #:local-build? #t #:tests? #f ; No test suite + #:make-flags (list (string-append "CC=" ,(cc-for-target)) + (string-append "PREFIX=" (assoc-ref %outputs "out"))) #:phases (modify-phases %standard-phases (add-before 'build 'change-directory