From a8625652e09fb4db2afdf34772f311d6119b98b3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Tue, 28 May 2024 12:50:06 +0200 Subject: 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 ea79c003e1..4492d8963a 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -8939,7 +8939,15 @@ (define-public psm "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"))) -- cgit v1.2.3