JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

kytea: fix build after #28029

Browse Source 
It moved our -O2 before their -O3, but -O3 inlines "checkValueVecEqual(&,&)" into
"checkValueVecEqual(*,*)".
This commit is contained in:
Orivej Desh 2018-05-29 17:09:28 +00:00
parent 842f1af65e
commit 51af2c330b
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkgs/tools/text/kytea/default.nix
View File

@ -10,12 +10,14 @@ stdenv.mkDerivation rec {
sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk"; sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
}; };
patches = [ ./gcc-O3.patch ];
meta = with stdenv.lib; { meta = with stdenv.lib; {
homepage = http://www.phontron.com/kytea/; homepage = http://www.phontron.com/kytea/;
description = "General toolkit developed for analyzing text"; description = "General toolkit developed for analyzing text";
longDescription = '' longDescription = ''
A general toolkit developed for analyzing text, with a focus on Japanese, A general toolkit developed for analyzing text, with a focus on Japanese,
Chinese and other languages requiring word or morpheme segmentation. Chinese and other languages requiring word or morpheme segmentation.
''; '';

13
pkgs/tools/text/kytea/gcc-O3.patch Normal file
View File

@ -0,0 +1,13 @@
diff --git a/src/lib/kytea-util.cpp b/src/lib/kytea-util.cpp
index 7c8c4c6..4492df1 100644
--- a/src/lib/kytea-util.cpp
+++ b/src/lib/kytea-util.cpp
@@ -49,5 +49,8 @@ void checkValueVecEqual(const std::vector<T> * a, const std::vector<T> * b) {
+template void checkValueVecEqual(const std::vector<unsigned int> & a, const std::vector<unsigned int> & b);
template void checkValueVecEqual(const std::vector<unsigned int> * a, const std::vector<unsigned int> * b);
+template void checkValueVecEqual(const std::vector<short> & a, const std::vector<short> & b);
template void checkValueVecEqual(const std::vector<short> * a, const std::vector<short> * b);
template void checkValueVecEqual(const std::vector<vector<KyteaString> > * a, const std::vector<vector<KyteaString> > * b);
+template void checkValueVecEqual(const std::vector<int> & a, const std::vector<int> & b);
template void checkValueVecEqual(const std::vector<int> * a, const std::vector<int> * b);