branch core-packages-team updated: squash! gnu: guile-lzlib: Fix build with gcc-14.

[guix-commits]

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

janneke pushed a commit to branch core-packages-team
in repository guix.

The following commit(s) were added to refs/heads/core-packages-team by this 
push:
     new 3ad77a95d2 squash! gnu: guile-lzlib: Fix build with gcc-14.
3ad77a95d2 is described below

commit 3ad77a95d29a71809b407cac5e0d0148d63171fb
Author: Janneke Nieuwenhuizen <janneke@gnu.org>
AuthorDate: Sat Dec 7 09:19:21 2024 +0100

    squash! gnu: guile-lzlib: Fix build with gcc-14.
    
    * gnu/packages/patches/guile-lzlib-gcc-14.patch: New file.
    * gnu/local.mk (dist_patch_DATA): Register it.
    * gnu/packages/guile.scm (guile-lzlib)["source"]: Use it, together with
    "guile-lzlib-hurd64.patch".
    [arguments]: Remove "apply-hurd64-patch" phase.
    
    Change-Id: Iecc42bfd192c21b08b56c144e4dc95bb5ebc875c
---
 gnu/local.mk                                  |  1 +
 gnu/packages/guile.scm                        |  3 ++-
 gnu/packages/patches/guile-lzlib-gcc-14.patch | 32 +++++++++++++++++++++++++++
 3 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index 30b63541f5..ed68f55b14 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1519,6 +1519,7 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/guile-fix-invalid-unicode-handling.patch \
   %D%/packages/patches/guile-gdbm-ffi-support-gdbm-1.14.patch  \
   %D%/packages/patches/guile-hurd-posix-spawn.patch            \
+  %D%/packages/patches/guile-lzlib-gcc-14.patch                        \
   %D%/packages/patches/guile-lzlib-hurd64.patch                        \
   %D%/packages/patches/guile-present-coding.patch              \
   %D%/packages/patches/guile-rsvg-pkgconfig.patch              \
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index cdb5e1ce93..4b647e8268 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -960,7 +960,8 @@ Guile's foreign function interface.")
        (sha256
         (base32
          "1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7"))
-       (patches (search-patches "guile-lzlib-hurd64.patch"))))
+       (patches (search-patches "guile-lzlib-gcc-14.patch"
+                                "guile-lzlib-hurd64.patch"))))
     (build-system gnu-build-system)
     (arguments
      (list
diff --git a/gnu/packages/patches/guile-lzlib-gcc-14.patch 
b/gnu/packages/patches/guile-lzlib-gcc-14.patch
new file mode 100644
index 0000000000..143b7adf7b
--- /dev/null
+++ b/gnu/packages/patches/guile-lzlib-gcc-14.patch
@@ -0,0 +1,32 @@
+Upstream-status: Presented upstream.
+
+From 8b0db8997007d427ce9e77cb8191e698d1c47f02 Mon Sep 17 00:00:00 2001
+From: "janneke@gnu.org" <janneke@gnu.org>
+Date: Sat, 7 Dec 2024 09:48:49 +0100
+Subject: [PATCH] build: Support gcc-14.
+
+* configure.ac: When compiling natively declare LZ_decompress_open before
+using it in conftest.c.
+---
+ configure.ac | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 4c56768..ffdab1d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,10 @@ EOF
+      else
+        old_LIBS="$LIBS"
+        LIBS="-llz"
+-       AC_LINK_IFELSE([AC_LANG_SOURCE([int main () { return 
LZ_decompress_open(); }])],
++       AC_LINK_IFELSE([AC_LANG_SOURCE([
++int LZ_decompress_open ();
++int main () { return LZ_decompress_open(); }
++])],
+        [guile_cv_liblz_libdir="`ldd conftest$EXEEXT | grep liblz | sed 
'-es/.*=> \(.*\) .*$/\1/g'`"])
+        LIBS="$old_LIBS"
+      fi])
+-- 
+2.46.0
+