janneke pushed a commit to branch core-packages-team
in repository guix.
commit 7f1cb4927a95fb73bf744a82968720258effa8d2
Author: Janneke Nieuwenhuizen <jann...@gnu.org>
AuthorDate: Sat Dec 7 09:19:21 2024 +0100
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 | 16 ++++----------
gnu/packages/patches/guile-lzlib-gcc-14.patch | 32 +++++++++++++++++++++++++++
3 files changed, 37 insertions(+), 12 deletions(-)
diff --git a/gnu/local.mk b/gnu/local.mk
index a570ba9cda..475c77de4c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1555,6 +1555,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 0e600fbc09..36db4d482e 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -938,21 +938,13 @@ Guile's foreign function interface.")
(file-name (string-append "guile-lzlib-" version ".tar.gz"))
(sha256
(base32
- "1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7"))))
+ "1whgmwkr1v8m63p4aaqn8blwl9vcrswwhbfv4bm0aghl5a6rryd7"))
+ (patches (search-patches "guile-lzlib-gcc-14.patch"
+ "guile-lzlib-hurd64.patch"))))
(build-system gnu-build-system)
(arguments
(list
- #:make-flags #~'("GUILE_AUTO_COMPILE=0") ;prevent guild warnings
- #:phases (if (or (%current-target-system) (target-hurd64?))
- #~(modify-phases %standard-phases
- (add-after 'unpack 'apply-hurd64-patch
- (lambda _
- (let ((patch
- #$(local-file
- (search-patch
- "guile-lzlib-hurd64.patch"))))
- (invoke "patch" "--force" "-p1" "-i" patch)))))
- #~%standard-phases)))
+ #:make-flags #~'("GUILE_AUTO_COMPILE=0"))) ;prevent guild warnings
(native-inputs (list autoconf automake pkg-config guile-3.0))
(inputs (list guile-3.0 lzlib))
(synopsis "Guile bindings to lzlib")
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: "jann...@gnu.org" <jann...@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
+
