futurile/guix-play
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

gnu-bootstrap: Configure PACKAGE_NAME.

Browse Source 
* guix/build/gnu-bootstrap.scm (bootstrap-configure): Add a 'name'
argument and use it to configure the PACKAGE_NAME variable.
* gnu/packages/commencement.scm (bootar, gash-boot,
gash-utils-boot): Use the new argument.
This commit is contained in:
Timothy Sample 2021-02-06 13:31:15 -05:00
parent 4c19c3eb06
commit 5268bd97b1
No known key found for this signature in database
GPG Key ID: 2AC6A5EC1C357C59
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gnu/packages/commencement.scm
View File

@ -120,7 +120,8 @@
(guile (string-append guile-dir "/bin/guile")))
(invoke guile "--no-auto-compile" source)
(chdir "bootar"))))
(replace 'configure (bootstrap-configure ,version "." "scripts"))
(replace 'configure (bootstrap-configure "Bootar" ,version
"." "scripts"))
(replace 'build (bootstrap-build "."))
(replace 'install (bootstrap-install "." "scripts"))))))
(inputs `(("guile" ,%bootstrap-guile)))
@ -156,7 +157,8 @@ pure Scheme to Tar and decompression in one easy step.")
(use-modules (guix build gnu-bootstrap))
(modify-phases %standard-phases
(replace 'configure
(bootstrap-configure ,(package-version gash) "gash" "scripts"))
(bootstrap-configure "Gash" ,(package-version gash)
"gash" "scripts"))
(replace 'build (bootstrap-build "gash"))
(replace 'install (bootstrap-install "gash" "scripts"))
(add-after 'install 'install-symlinks
@ -219,7 +221,7 @@ pure Scheme to Tar and decompression in one easy step.")
(("@UTILITY@") "testb"))
(delete-file "scripts/template.in")))
(replace 'configure
(bootstrap-configure ,(package-version gash-utils)
(bootstrap-configure "Gash-Utils" ,(package-version gash-utils)
"gash" "scripts"))
(replace 'build (bootstrap-build "gash"))
(replace 'install (bootstrap-install "gash" "scripts"))

11
guix/build/gnu-bootstrap.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2020 Timothy Sample <samplet@ngyro.com>
;;; Copyright © 2020, 2022 Timothy Sample <samplet@ngyro.com>
;;;
;;; This file is part of GNU Guix.
;;;
@ -30,12 +30,12 @@
bootstrap-build
bootstrap-install))
(define (bootstrap-configure version modules scripts)
(define (bootstrap-configure name version modules scripts)
"Create a procedure that configures an early bootstrap package. The
procedure will search the MODULES directory and configure all of the
'.in' files with VERSION. It will then search the SCRIPTS directory and
configure all of the '.in' files with the bootstrap Guile and its module
and object directories."
'.in' files with NAME and VERSION. It will then search the SCRIPTS
directory and configure all of the '.in' files with the bootstrap
Guile and its module and object directories."
(lambda* (#:key inputs outputs #:allow-other-keys)
(let* ((out (assoc-ref outputs "out"))
(guile-dir (assoc-ref inputs "guile"))
@ -50,6 +50,7 @@ and object directories."
(let ((target (string-drop-right template 3)))
(copy-file template target)
(substitute* target
(("@PACKAGE_NAME@") name)
(("@VERSION@") version))))
(find-files modules
(lambda (fn st)