From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp11.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms8.migadu.com with LMTPS id YIozD9PQMWWF+AAA9RJhRA:P1 (envelope-from ) for ; Fri, 20 Oct 2023 02:58:59 +0200 Received: from aspmx1.migadu.com ([2001:41d0:403:4789::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp11.migadu.com with LMTPS id YIozD9PQMWWF+AAA9RJhRA (envelope-from ) for ; Fri, 20 Oct 2023 02:58:59 +0200 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 B737358DFD for ; Fri, 20 Oct 2023 02:58:58 +0200 (CEST) Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=aD+J7qj0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Seal: i=1; s=key1; d=yhetil.org; t=1697763539; a=rsa-sha256; cv=none; b=oN+A8GSt4p22jlHLiOoKFIkwo1Of87cDS3X3OmPc3/tQb6JF2kfdStHMtrdKZr3lqW2xXk sg9tlF8oThZ6Jg7HoEttkdR7H6sEAckfQljGegAJL3LvY05lL7aiKf14nAho+quNYAQaFB fn6m57fBSPOHpqLgxAJMRaMHtFSnlannbrWniNMWpiSifvsSZ1NnqO4XhrY7vTn4pvehqN Aq4TkVdKQuKy/aEv8Oly7QCiXnJo/dP0/SeM3S/jKHDESHe3dIU1Z+4/YvLOM3f/rRRQoJ m8PQpFEvb+j1ROiV5UxG0sjoPVwPu7En1MI1Jy2vb/lkxqfWSeLu1vOgPKf3pQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=gmail.com header.s=20230601 header.b=aD+J7qj0; dmarc=fail reason="SPF not aligned (relaxed)" header.from=gmail.com (policy=none); spf=pass (aspmx1.migadu.com: domain of "guix-patches-bounces+larch=yhetil.org@gnu.org" designates 209.51.188.17 as permitted sender) smtp.mailfrom="guix-patches-bounces+larch=yhetil.org@gnu.org" ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1697763539; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=Okco+31FqmL/2OCY1wTsGhnDcafE/pDvBRDkBKQDPMQ=; b=lrxnfW3sr1prgq+3q4Td4Yb/K5z1pliB4cMq3LtSo1bcEKV4BYAX4Q1GI2tHHoEieuwc4o T8uwikbDjYP9FuP52OcUM65xGrUfnSt+l2JVyCze4KSEjTZze1VBSpjSbiAiT7TBM+3mYs qzYPqhzuE+z9c5SSTaB/E8+jbpdNl4fDDp7qqEJ2y47H9qv8cKw+lYMMkfS+A51a3Qm8TE QJDuC/lGYUBwfrWek6pz5NpsX5rdTcHxZJ/B5WOv16++6wv4IZ6Ptx2U/YUwjhSvyYNhUK bzLBkydO8JImlhJfv9fpHDvP19KHShw+aFftIf+MvJz8UVwxwQyOUKjX+4/8Nw== Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtdqb-0003mH-3g; Thu, 19 Oct 2023 20:58:41 -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 1qtdqX-0003lj-Vw for guix-patches@gnu.org; Thu, 19 Oct 2023 20:58:39 -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 1qtdqW-0007Nn-NQ; Thu, 19 Oct 2023 20:58:36 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtdqx-0003l3-3M; Thu, 19 Oct 2023 20:59:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#42146] [PATCH v3 3/3] build: bootstrap-configure: Allow lack of matches in substitute. Resent-From: Maxim Cournoyer Original-Sender: "Debbugs-submit" Resent-CC: kuba@kadziolka.net, maxim.cournoyer@gmail.com, ludo@gnu.org, guix-patches@gnu.org Resent-Date: Fri, 20 Oct 2023 00:59:03 +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 Cc: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= , Maxim Cournoyer , Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= , Maxim Cournoyer , Ludovic =?UTF-8?Q?Court=C3=A8s?= X-Debbugs-Original-Xcc: Jakub =?UTF-8?Q?K=C4=85dzio=C5=82ka?= , Maxim Cournoyer , Ludovic =?UTF-8?Q?Court=C3=A8s?= Received: via spool by 42146-submit@debbugs.gnu.org id=B42146.169776352014389 (code B ref 42146); Fri, 20 Oct 2023 00:59:03 +0000 Received: (at 42146) by debbugs.gnu.org; 20 Oct 2023 00:58:40 +0000 Received: from localhost ([127.0.0.1]:38248 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtdqZ-0003k0-Ou for submit@debbugs.gnu.org; Thu, 19 Oct 2023 20:58:40 -0400 Received: from mail-qv1-xf2b.google.com ([2607:f8b0:4864:20::f2b]:57766) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtdqU-0003jI-8T for 42146@debbugs.gnu.org; Thu, 19 Oct 2023 20:58:34 -0400 Received: by mail-qv1-xf2b.google.com with SMTP id 6a1803df08f44-66d1ef93284so1846436d6.3 for <42146@debbugs.gnu.org>; Thu, 19 Oct 2023 17:58:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1697763481; x=1698368281; 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=Okco+31FqmL/2OCY1wTsGhnDcafE/pDvBRDkBKQDPMQ=; b=aD+J7qj0wzdhyo/s9o/3AXEL9x8CD1em8R2Uv0XT/GngQFOEA0Ix+I8kK5HrLpBBEF KNvgbAI+cRKYyI2sXjBoGvZkihQTh3T6AePJ1kMnW1BEOXgrSBIBp8W4aGg/ZXxwYwTJ Vvf4yaUgfC3odrFRSCiEuPoq2UKX+TDCnRNHFT8aP8dyjqjzA/8Y2XcEZctx1U/NSraH eAj2BL4ry5bh92M50x5NLMBoUM2G2gvYcTD5DMZuRRrAsGZZO+0p6GoBNyNwqNKCAKE2 AnWOZTn6QGBciMF4WpZw+B7+YZO+VoN2RME7VhcWVsyeGQg1TMgKcDk75qmMGAAoAvn3 PpMw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697763481; x=1698368281; 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=Okco+31FqmL/2OCY1wTsGhnDcafE/pDvBRDkBKQDPMQ=; b=PDtSoIX3DO67IsKMPhqlLqR4Wu7bhKvbvBA3rHLoDcxCmYq4ZmJwexsdbDbwCPLS6H KHqPsV2rWqt3SJvBot/o1VxLIsZfa90ENWsjFu2LMSxoXILQ3SUVJGReegyJk/nWJYsI 5C2sk5S1DPCm6xoVVZVAkvRyFa2dgffO3xxIByMvHi37wgnhDxyRny0kjk8TkbJ1vNSO AHOBPRcdBY266CXuRMNO+s3K+Nndy15lynHkP7Ua88a6k2vxL0P/NhhkSQbrvE9NUx1i U4EYzWUfwx8AH4Cf3LWPxJq36Mz5Xa8CsvPo2r+SkQAzbprS7Nc2/pAqIB09XLRT7jgi sC7A== X-Gm-Message-State: AOJu0YwrplRQ8NAbe0WGf8ELyQ7u+L8CSX4B45oHPzWfWhq+BhcB2TMr /yzV4LnMeYL+QQwDqOYYet3Za0OK0L23sA== X-Google-Smtp-Source: AGHT+IHOeyg2TlEhzsDG7QYDtqv0C6wCL/uCNhGfkHtGddGZCAeNQkqnKQPedJhYS+Ay1qDn0g0RDg== X-Received: by 2002:a05:6214:519e:b0:66d:140a:18f3 with SMTP id kl30-20020a056214519e00b0066d140a18f3mr541647qvb.45.1697763481643; Thu, 19 Oct 2023 17:58:01 -0700 (PDT) Received: from localhost.localdomain (dsl-156-111.b2b2c.ca. [66.158.156.111]) by smtp.gmail.com with ESMTPSA id h9-20020a0cf8c9000000b0065d0a4262e0sm279097qvo.70.2023.10.19.17.58.00 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Oct 2023 17:58:01 -0700 (PDT) From: Maxim Cournoyer Date: Thu, 19 Oct 2023 20:57:40 -0400 Message-ID: <0d8764ba1b635d49c07cc1d47f3dcc620bbf482d.1697763444.git.maxim.cournoyer@gmail.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: guix-patches-bounces+larch=yhetil.org@gnu.org X-Migadu-Country: US X-Migadu-Flow: FLOW_IN X-Migadu-Scanner: mx1.migadu.com X-Migadu-Spam-Score: 4.34 X-Spam-Score: 4.34 X-Migadu-Queue-Id: B737358DFD X-TUID: rrzD1lme5F+l From: Jakub Kądziołka 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*. Signed-off-by: Maxim Cournoyer Change-Id: I7eee433a3af5fa310b3f2e8b8b58ac9befb4b56a --- guix/build/gnu-bootstrap.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm index b4257a3717..b097f410ad 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, 2022 Timothy Sample +;;; Copyright © 2020 Jakub Kądziołka ;;; ;;; This file is part of GNU Guix. ;;; @@ -52,7 +53,8 @@ (define (bootstrap-configure name version modules scripts) (copy-file template target) (substitute* target (("@PACKAGE_NAME@") name) - (("@VERSION@") version)))) + (("@VERSION@") version) + #:require-matches? #f))) (append-map (lambda (dir) (find-files dir "\\.in$")) modules)) (for-each (lambda (template) @@ -62,12 +64,12 @@ (define (bootstrap-configure name version modules scripts) (substitute* target (("@GUILE@") guile) (("@MODDIR@") moddir) - (("@GODIR@") godir)) + (("@GODIR@") godir) + #:require-matches? #f) (chmod target #o755))) (find-files scripts (lambda (fn st) - (string-suffix? ".in" fn)))) - #t))) + (string-suffix? ".in" fn))))))) (define (bootstrap-build modules) "Create a procedure that builds an early bootstrap package. The -- 2.41.0