[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#42146] [PATCH 3/3] build: bootstrap-configure: Allow lack of matche
From: |
Maxim Cournoyer |
Subject: |
[bug#42146] [PATCH 3/3] build: bootstrap-configure: Allow lack of matches in substitute. |
Date: |
Thu, 19 Oct 2023 16:33:34 -0400 |
From: Jakub Kądziołka <kuba@kadziolka.net>
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 <maxim.cournoyer@gmail.com>
---
guix/build/gnu-bootstrap.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/guix/build/gnu-bootstrap.scm b/guix/build/gnu-bootstrap.scm
index b4257a3717..d044c8acd9 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 <samplet@ngyro.com>
+;;; Copyright © 2020 Jakub Kądziołka <kuba@kadziolka.net>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -51,6 +52,7 @@ (define (bootstrap-configure name version modules scripts)
(let ((target (string-drop-right template 3)))
(copy-file template target)
(substitute* target
+ #:require-matches? #f
(("@PACKAGE_NAME@") name)
(("@VERSION@") version))))
(append-map (lambda (dir) (find-files dir "\\.in$"))
@@ -60,14 +62,14 @@ (define (bootstrap-configure name version modules scripts)
(let ((target (string-drop-right template 3)))
(copy-file template target)
(substitute* target
+ #:require-matches? #f
(("@GUILE@") guile)
(("@MODDIR@") moddir)
(("@GODIR@") godir))
(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