civodul pushed a commit to branch core-updates
in repository guix.
commit da0ef29cf10ac20257858164e9a00e846c2a2762
Author: Ludovic Courtès <[email protected]>
AuthorDate: Thu Aug 15 16:30:42 2024 +0200
gnu: make-bootstrap: Include libdl.a and libutil.a in ‘glibc-stripped’.
As of glibc 2.39, libdl.so and libutil.so are gone (they are part of
libc proper since 2.34), but empty .a files are provided for backward
compatibility with code using -ldl and -lutil. Keep them.
* guix/build/make-bootstrap.scm (make-stripped-libc)[%libc-object-files-rx]:
Mach libdl.a and libutil.a.
Change-Id: I967c6f34a443366224293362b8a2302fe86fd5a0
---
guix/build/make-bootstrap.scm | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/guix/build/make-bootstrap.scm b/guix/build/make-bootstrap.scm
index 6cb5262f8e..287e4db2c7 100644
--- a/guix/build/make-bootstrap.scm
+++ b/guix/build/make-bootstrap.scm
@@ -110,9 +110,11 @@ when producing a bootstrap libc."
(copy-recursively (string-append libc "/include") incdir)
(copy-linux-headers output kernel-headers)))
+ ;; Include *.so, *.so.*, but also empty ar archives provided for backward
+ ;; compatibility as of libc 2.39: libdl.a and libutil.a.
(define %libc-object-files-rx "^(crt.*|ld.*|lib(c|m|dl|rt|pthread|nsl|\
util).*\\.so(\\..*)?|lib(machuser|hurduser).so.*|(libc(rt|)|libpthread)\
-_nonshared\\.a)$")
+_nonshared\\.a|lib(dl|util)\\.a)$")
(setvbuf (current-output-port) 'line)
(let* ((libdir (string-append output "/lib")))
