From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id CAtoAri4+162BAAA0tVLHw (envelope-from ) for ; Tue, 30 Jun 2020 22:12:08 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id aP3nObe4+17VFAAAB5/wlQ (envelope-from ) for ; Tue, 30 Jun 2020 22:12:07 +0000 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 A036A940308 for ; Tue, 30 Jun 2020 22:12:07 +0000 (UTC) Received: from localhost ([::1]:32910 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jqOU2-0005AV-J5 for larch@yhetil.org; Tue, 30 Jun 2020 18:12:06 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59196) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jqOTy-0005A4-Q7 for guix-patches@gnu.org; Tue, 30 Jun 2020 18:12:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:40363) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jqOTy-0001Du-HH for guix-patches@gnu.org; Tue, 30 Jun 2020 18:12:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jqOTy-0008D9-DH for guix-patches@gnu.org; Tue, 30 Jun 2020 18:12:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42146] [PATCH 2/?] build: bootstrap-configure: Allow lack of matches in substitute. References: <20200630220913.14665-1-kuba@kadziolka.net> In-Reply-To: <20200630220913.14665-1-kuba@kadziolka.net> Resent-From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Tue, 30 Jun 2020 22:12:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 42146 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 42146@debbugs.gnu.org Received: via spool by 42146-submit@debbugs.gnu.org id=B42146.159355509031509 (code B ref 42146); Tue, 30 Jun 2020 22:12:02 +0000 Received: (at 42146) by debbugs.gnu.org; 30 Jun 2020 22:11:30 +0000 Received: from localhost ([127.0.0.1]:51906 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqOTR-0008C9-Qx for submit@debbugs.gnu.org; Tue, 30 Jun 2020 18:11:30 -0400 Received: from pat.zlotemysli.pl ([37.59.186.212]:46372) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jqOTP-0008C0-DK for 42146@debbugs.gnu.org; Tue, 30 Jun 2020 18:11:28 -0400 Received: (qmail 8685 invoked by uid 1009); 1 Jul 2020 00:11:25 +0200 Received: from 188.123.215.55 (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl (envelope-from , uid 1002) with qmail-scanner-2.08st (clamdscan: 0.98.6/25858. spamassassin: 3.4.0. perlscan: 2.08st. Clear:RC:1(188.123.215.55):. Processed in 0.011385 secs); 30 Jun 2020 22:11:25 -0000 Received: from unknown (HELO localhost.localdomain) (kuba@kadziolka.net@188.123.215.55) by pat.zlotemysli.pl with AES256-SHA encrypted SMTP; 1 Jul 2020 00:11:25 +0200 From: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= Date: Wed, 1 Jul 2020 00:11:21 +0200 Message-Id: <20200630221121.16086-1-kuba@kadziolka.net> X-Mailer: git-send-email 2.26.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Score: 0.0 (/) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -1.0 (-) 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" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -0.01 X-TUID: fGc1h8p8Mdty Matches are not required here, as not every file will use every variable. * guix/build/gnu-bootstrap.scm (bootstrap-configure): Pass #:require-matches? #f to substitute*. --- guix/build/gnu-bootstrap.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm index 1cb9dc5512..6ee520e301 100644 --- a/guix/build/gnu-bootstrap.scm +++ b/guix/build/gnu-bootstrap.scm @@ -1,5 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020 Timothy Sample +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -49,7 +50,7 @@ and object directories." (format #t "Configuring ~a~%" template) (let ((target (string-drop-right template 3))) (copy-file template target) - (substitute* target + (substitute* target #:require-matches? #f (("@VERSION@") version)))) (find-files modules (lambda (fn st) @@ -58,7 +59,7 @@ and object directories." (format #t "Configuring ~a~%" template) (let ((target (string-drop-right template 3))) (copy-file template target) - (substitute* target + (substitute* target #:require-matches? #f (("@GUILE@") guile) (("@MODDIR@") moddir) (("@GODIR@") godir)) -- 2.26.2