guix_mirror_bot pushed a commit to branch core-packages-team in repository guix.
commit ebc75eaa4b23f22f6c251543764891f14f0f8585 Author: Nicolas Graves <[email protected]> AuthorDate: Wed Feb 18 10:09:04 2026 +0100 gnu: glibc-mesboot: Improve style. * gnu/packages/commencement.scm (glibc-mesboot) [native-inputs]: Drop input labels. [arguments]<#:make-flags, #:phases>: Improve style, use G-expressions and search-input-file. Change-Id: I981447b416bfb7ef313b41ec8f4647e1614e56e2 Signed-off-by: Ludovic Courtès <[email protected]> --- gnu/packages/commencement.scm | 59 +++++++++++++++++++++++-------------------- 1 file changed, 32 insertions(+), 27 deletions(-) diff --git a/gnu/packages/commencement.scm b/gnu/packages/commencement.scm index cd61f288b58..122db31d6e3 100644 --- a/gnu/packages/commencement.scm +++ b/gnu/packages/commencement.scm @@ -1691,34 +1691,39 @@ ac_cv_c_float_format='IEEE (little-endian)' (package (inherit glibc-headers-mesboot) (name "glibc-mesboot") - (native-inputs `(("headers" ,glibc-headers-mesboot) - ,@(%boot-mesboot3-inputs))) + (native-inputs (cons* glibc-headers-mesboot + (map cadr (%boot-mesboot3-inputs)))) (arguments - `(#:validate-runpath? #f ; fails when using --enable-shared - ,@(substitute-keyword-arguments arguments - ((#:make-flags make-flags) - #~(let ((bash (assoc-ref %build-inputs "bash"))) - (list (string-append "SHELL=" bash "/bin/sh")))) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'unpack 'simplify-intl-tests - (lambda _ - ;; The bootstrap Guile (2.0.9) crashes trying to - ;; perform a regex on non-ASCII text. This gets - ;; triggered by 'intl/po2test.sed' running over - ;; 'po/de.po'. If we ever remove the bootstrap - ;; Guile or add pure-Scheme regex to Gash, this can - ;; be removed. - (substitute* '("catgets/Makefile" - "intl/Makefile") - (("de\\.po") "en_GB.po")))) - (replace 'install - (lambda* (#:key outputs make-flags #:allow-other-keys) - (let* ((kernel-headers (assoc-ref %build-inputs "kernel-headers")) - (out (assoc-ref outputs "out")) - (install-flags (cons "install" make-flags))) - (apply invoke "make" install-flags) - (copy-recursively kernel-headers out))))))))))) + (cons* + #:validate-runpath? #f ; fails when using --enable-shared + (substitute-keyword-arguments (package-arguments glibc-headers-mesboot) + ((#:make-flags make-flags) + #~(let ((bash (search-input-file %build-inputs "/bin/sh"))) + (list (string-append "SHELL=" bash)))) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'simplify-intl-tests + (lambda _ + ;; The bootstrap Guile (2.0.9) crashes trying to + ;; perform a regex on non-ASCII text. This gets + ;; triggered by 'intl/po2test.sed' running over + ;; 'po/de.po'. If we ever remove the bootstrap + ;; Guile or add pure-Scheme regex to Gash, this can + ;; be removed. + (substitute* '("catgets/Makefile" + "intl/Makefile") + (("de\\.po") "en_GB.po")))) + (replace 'install + (lambda* (#:key make-flags inputs #:allow-other-keys) + (let* ((kernel-headers + (search-input-directory inputs + #$(if (system-hurd?) + "include/mach" + "include/linux"))) + (kernel-headers (dirname (dirname kernel-headers))) + (install-flags (cons "install" make-flags))) + (apply invoke "make" install-flags) + (copy-recursively kernel-headers #$output))))))))))) (define (%boot-mesboot4-inputs) `(("libc" ,glibc-mesboot)
