summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2024-05-15 21:29:54 +0200
committerLudovic Courtès <ludo@gnu.org>2024-08-31 10:45:02 +0200
commit526f8b955ca9f4e3277379642b3f724c15f1bbc9 (patch)
treec396202e558b1ffd4b83ac709d903a2ce8fc7a1b
parentc7377b7e043de3dd5b870c7ad6822b6d5151db16 (diff)
downloadguix-526f8b955ca9f4e3277379642b3f724c15f1bbc9.tar.gz
gnu: psm2: Allow compilation with glibc 2.39.
* gnu/packages/linux.scm (psm2)[source]: Add snippet.

Change-Id: Iff29026da7252e4ca35bdde25b24d83bab0d5554
-rw-r--r--gnu/packages/linux.scm10
1 files changed, 9 insertions, 1 deletions
diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm
index 9c6b778e5c..ea79c003e1 100644
--- a/gnu/packages/linux.scm
+++ b/gnu/packages/linux.scm
@@ -9193,7 +9193,15 @@ privileges.")
               (file-name (git-file-name name version))
               (sha256
                (base32
-                "04nar65ac11qqx41vkfs7iip8kfiah0zms7l4rmsxncpiz2iqfik"))))
+                "04nar65ac11qqx41vkfs7iip8kfiah0zms7l4rmsxncpiz2iqfik"))
+              (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")
+                    "psm2_custom_strlcat")))))
     (build-system gnu-build-system)
     (arguments
      (list #:make-flags