diff options
| author | Janneke Nieuwenhuizen <janneke@gnu.org> | 2025-01-01 17:54:34 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2025-07-18 20:17:20 +0200 |
| commit | f69553ba986913049e5fd8672b82f19256eba087 (patch) | |
| tree | 17698ab9207e881ef2d13b09ca8bedcc9bfe4232 | |
| parent | c32ee518ec4b54019080d3deabf5af67565cf60f (diff) | |
gnu: clucene: Fix build with gcc-14.
* gnu/packages/patches/clucene-gcc-14.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/rdf.scm (clucene)[source]: Use it.
Change-Id: Ief8de0cb52480dccdbcc1ac45c33a8767fdd4211
| -rw-r--r-- | gnu/local.mk | 1 | ||||
| -rw-r--r-- | gnu/packages/bootstrap.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/patches/clucene-gcc-14.patch | 13 | ||||
| -rw-r--r-- | gnu/packages/rdf.scm | 5 |
4 files changed, 20 insertions, 4 deletions
diff --git a/gnu/local.mk b/gnu/local.mk index b2226c1576..ec3a04a890 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1141,6 +1141,7 @@ dist_patch_DATA = \ %D%/packages/patches/classpath-miscompilation.patch \ %D%/packages/patches/clitest-grep-compat.patch \ %D%/packages/patches/clog-fix-shared-build.patch \ + %D%/packages/patches/clucene-gcc-14.patch \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ diff --git a/gnu/packages/bootstrap.scm b/gnu/packages/bootstrap.scm index b8a38aab5c..3f634892e1 100644 --- a/gnu/packages/bootstrap.scm +++ b/gnu/packages/bootstrap.scm @@ -780,8 +780,9 @@ $out/bin/guile --version~%" ;; Patch linker scripts so they refer to the right file-names. (substitute* ,(cond ((target-hurd64?) ''("lib/libc.so" "lib/libm.so")) - ((or (target-x86?) - (target-arm?)) + ((and (not (target-hurd?)) + (or (target-x86?) + (target-arm?))) ''("lib/libc.so" "lib/libpthread.so")) (else ''("lib/libc.so"))) diff --git a/gnu/packages/patches/clucene-gcc-14.patch b/gnu/packages/patches/clucene-gcc-14.patch new file mode 100644 index 0000000000..aa1296a006 --- /dev/null +++ b/gnu/packages/patches/clucene-gcc-14.patch @@ -0,0 +1,13 @@ +Upstream-status: Not presented upstream. + +--- clucene-core-2.3.3.4.orig/src/core/CLucene/document/DateTools.cpp 1970-01-01 01:00:01.000000000 +0100 ++++ clucene-core-2.3.3.4/src/core/CLucene/document/DateTools.cpp 2025-01-01 17:41:36.055237798 +0100 +@@ -9,6 +9,8 @@ + #include "DateTools.h" + #include "CLucene/util/Misc.h" + ++#include <ctime> ++ + CL_NS_USE(util) + CL_NS_DEF(document) + diff --git a/gnu/packages/rdf.scm b/gnu/packages/rdf.scm index 481f848a6b..9e78fd7879 100644 --- a/gnu/packages/rdf.scm +++ b/gnu/packages/rdf.scm @@ -10,7 +10,7 @@ ;;; Copyright © 2022 Marius Bakke <marius@gnu.org> ;;; Copyright © 2022 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2023 Brendan Tildesley <mail@brendan.scot> -;;; Copyright © 2024 Janneke Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2024, 2025 Janneke Nieuwenhuizen <janneke@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -108,7 +108,8 @@ HTML and JSON.") (base32 "1arffdwivig88kkx685pldr784njm0249k0rb1f1plwavlrw9zfx")) (patches (search-patches "clucene-pkgconfig.patch" - "clucene-contribs-lib.patch")))) + "clucene-contribs-lib.patch" + "clucene-gcc-14.patch")))) (build-system cmake-build-system) (inputs (list boost ; could also use bundled copy |