branch core-updates updated: gnu: psm: Allow compilation with glibc 2.39.

[guix-commits]

This is an automated email from the git hooks/post-receive script.

civodul pushed a commit to branch core-updates
in repository guix.

The following commit(s) were added to refs/heads/core-updates by this push:
     new 75788fd52d gnu: psm: Allow compilation with glibc 2.39.
75788fd52d is described below

commit 75788fd52dda58a2143fd4a06e4966cde2247203
Author: Ludovic Courtès <ludovic.courtes@inria.fr>
AuthorDate: Tue May 28 12:50:06 2024 +0200

    gnu: psm: Allow compilation with glibc 2.39.
    
    * gnu/packages/linux.scm (psm)[source]: Add snippet.
    
    Change-Id: I366fcaa8bbc6a5c755cb958a2fd7a71883973415
---
 gnu/packages/linux.scm | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index a79f7b1a85..f81a403eda 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -8842,7 +8842,15 @@ libraries, which are often integrated directly into 
libfabric.")
                  "psm-arch.patch"     ; uname -p returns "unknown" on Debian 9
                  "psm-ldflags.patch"  ; build shared lib with LDFLAGS
                  "psm-repro.patch"    ; reproducibility
-                 "psm-disable-memory-stats.patch"))))
+                 "psm-disable-memory-stats.patch"))
+       (modules '((guix build utils)))
+       (snippet
+        ;; That file declares its own 'strlcat' as static.  To avoid a
+        ;; conflict with the function now in glibc 2.39, give it a
+        ;; different name.
+        #~(substitute* "ptl_ips/ips_proto_dump.c"
+            (("strlcat")
+             "psm_custom_strlcat")))))
     (build-system gnu-build-system)
     (outputs '("out" "debug"))
     (inputs `(("libuuid" ,util-linux "lib")))