civodul pushed a commit to branch core-updates
in repository guix.
commit 6e5e8f74944fc359de973b7ef29e537cbfd1685d
Author: Ludovic Courtès <[email protected]>
AuthorDate: Wed Aug 14 18:08:59 2024 +0200
gnu: make-bootstrap: Adjust ‘%glibc-stripped’ for [email protected] on the Hurd.
Previously the second ‘copy-recursively’ call would fail with EEXIST
since [email protected] already provides $includedir/include/mach.
* guix/build/make-bootstrap.scm (make-stripped-libc)[copy-mach-headers]:
Pass #:select? to ‘copy-recursively’ to exclude files already present
under INCDIR.
Change-Id: I7e5a93e46eefa18299c231468c720072468fdb10
---
guix/build/make-bootstrap.scm | 26 ++++++++++++++++++++------
1 file changed, 20 insertions(+), 6 deletions(-)
diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm
index 0d29338ce3..6cb5262f8e 100644
--- a/guix/build/make-bootstrap.scm
+++ b/guix/build/make-bootstrap.scm
@@ -1,6 +1,6 @@
;;; GNU Guix --- Functional package management for GNU
;;; Copyright © 2015, 2017 Manolis Fragkiskos Ragkousis <[email protected]>
-;;; Copyright © 2015, 2019 Ludovic Courtès <[email protected]>
+;;; Copyright © 2015, 2019, 2024 Ludovic Courtès <[email protected]>
;;; Copyright © 2018 Jan (janneke) Nieuwenhuizen <[email protected]>
;;;
;;; This file is part of GNU Guix.
@@ -84,13 +84,27 @@ bootstrap libc."
when producing a bootstrap libc."
(define (copy-mach-headers output kernel-headers)
- (let* ((incdir (string-append output "/include")))
+ (let ((mach-headers (readlink
+ (string-append kernel-headers "/include/mach")))
+ (incdir (string-append output "/include")))
(copy-recursively (string-append libc "/include") incdir)
- (copy-recursively (string-append kernel-headers "/include/mach")
- (string-append incdir "/mach"))
- #t))
-
+ ;; As of glibc 2.39, essential Mach headers get installed by glibc
+ ;; itself in its own includedir, except for most of mach/machine/*.h.
+ ;; Copy anything that's missing from MACH-HEADERS.
+ (copy-recursively mach-headers
+ (string-append incdir "/mach")
+ #:select?
+ (let ((prefix (string-length mach-headers))
+ (target (string-append incdir "/mach")))
+ (lambda (file stat)
+ ;; Select everything but files and symlinks that
+ ;; already exist under TARGET.
+ (or (eq? 'directory (stat:type stat))
+ (let ((suffix (string-drop file prefix)))
+ (not (file-exists?
+ (in-vicinity target suffix))))))))))
+
(define (copy-libc+linux-headers output kernel-headers)
(let* ((incdir (string-append output "/include")))
(copy-recursively (string-append libc "/include") incdir)
