tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: static-bash-for-glibc: Improve style.

Browse Source 
* gnu/packages/commencement.scm (static-bash-for-glibc)
[inputs]: Drop input labels.
[arguments]: Improve style, use G-expressions.
<#:configure-flags>: Use search-input-file.

Change-Id: I215a0a796fd24e49410c3a517fa49b9b5e58ed66
Signed-off-by: Ludovic Courtès <ludo@gnu.org>
This commit is contained in:
Nicolas Graves
2026-02-21 02:01:43 +01:00
committed by Ludovic Courtès
parent 852357a9cd
commit 5b086540ac
1 changed files with 18 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
gnu/packages/commencement.scm
View File

@@ -3125,24 +3125,25 @@ exec ~a/bin/~a-~a -B~a/lib -Wl,-dynamic-linker -Wl,~a/~a \"$@\"~%"
(package
(inherit static-bash)
(source (bootstrap-origin (package-source static-bash)))
(inputs `(("gcc" ,gcc-boot0-intermediate-wrapped)
("libc" ,glibc-final-with-bootstrap-bash)
("libc:static" ,glibc-final-with-bootstrap-bash "static")
,@(fold alist-delete (%boot1-inputs)
'("gcc" "libc"))))
(inputs
(cons* gcc-boot0-intermediate-wrapped
glibc-final-with-bootstrap-bash
(list glibc-final-with-bootstrap-bash "static")
(fold delete
(map cadr (%boot1-inputs))
(list gcc-boot0 glibc-mesboot))))
(arguments
`(#:implicit-inputs? #f
#:guile ,%bootstrap-guile
,@(substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
;; Add a '-L' flag so that the pseudo-cross-ld of
;; BINUTILS-BOOT0 can find libc.a.
#~(append #$flags
(list (string-append "LDFLAGS=-static -L"
(assoc-ref %build-inputs
"libc:static")
"/lib")))))))))
(append
(list #:implicit-inputs? #f
#:guile %bootstrap-guile)
(substitute-keyword-arguments arguments
((#:configure-flags flags #~'())
;; Add a '-L' flag so that the pseudo-cross-ld of
;; BINUTILS-BOOT0 can find libc.a.
#~(let ((libc.a (search-input-file %build-inputs "/lib/libc.a")))
(append #$flags
(list (string-append "LDFLAGS=-static -L"
(dirname libc.a)))))))))))
(define gettext-boot0
;; A minimal gettext used during bootstrap.