tribes/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2026-04-06 21:20:33 +02:00
Code Activity

gnu: clucene: Fix build with gcc-14.

Browse Source 
* 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
This commit is contained in:
Janneke Nieuwenhuizen
2025-01-01 17:54:34 +01:00
committed by Andreas Enge
parent c32ee518ec
commit f69553ba98
4 changed files with 20 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gnu/local.mk
View File

@@ -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 \

5
gnu/packages/bootstrap.scm
View File

@@ -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")))

13
gnu/packages/patches/clucene-gcc-14.patch Normal file
View File

@@ -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)

5
gnu/packages/rdf.scm
View File

@@ -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