summary refs log tree commit diff
diff options
context:
space:
mode:
authorOrivej Desh <orivej@gmx.fr>2018-05-29 17:09:28 +0000
committerOrivej Desh <orivej@gmx.fr>2018-05-29 17:11:29 +0000
commit51af2c330b2222f51383ecf11e89b8ec7571455e (patch)
treefd397d8d47f5253ebec9a5e71ee4dc0e0a7c7c1c
parent842f1af65e52d1e3acac927cc9a933651f2822c9 (diff)
downloadnixpkgs-51af2c330b2222f51383ecf11e89b8ec7571455e.tar
nixpkgs-51af2c330b2222f51383ecf11e89b8ec7571455e.tar.gz
nixpkgs-51af2c330b2222f51383ecf11e89b8ec7571455e.tar.bz2
nixpkgs-51af2c330b2222f51383ecf11e89b8ec7571455e.tar.lz
nixpkgs-51af2c330b2222f51383ecf11e89b8ec7571455e.tar.xz
nixpkgs-51af2c330b2222f51383ecf11e89b8ec7571455e.tar.zst
nixpkgs-51af2c330b2222f51383ecf11e89b8ec7571455e.zip
kytea: fix build after #28029
It moved our -O2 before their -O3, but -O3 inlines "checkValueVecEqual(&,&)" into
"checkValueVecEqual(*,*)".
-rw-r--r--pkgs/tools/text/kytea/default.nix4
-rw-r--r--pkgs/tools/text/kytea/gcc-O3.patch13
2 files changed, 16 insertions, 1 deletions
diff --git a/pkgs/tools/text/kytea/default.nix b/pkgs/tools/text/kytea/default.nix
index 142bb721277..eb537c67a63 100644
--- a/pkgs/tools/text/kytea/default.nix
+++ b/pkgs/tools/text/kytea/default.nix
@@ -10,12 +10,14 @@ stdenv.mkDerivation rec {
     sha256 = "0ilzzwn5vpvm65bnbyb9f5rxyxy3jmbafw9w0lgl5iad1ka36jjk";
   };
 
+  patches = [ ./gcc-O3.patch ];
+
   meta = with stdenv.lib; {
     homepage = http://www.phontron.com/kytea/;
     description = "General toolkit developed for analyzing text";
 
     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.
     '';
 
diff --git a/pkgs/tools/text/kytea/gcc-O3.patch b/pkgs/tools/text/kytea/gcc-O3.patch
new file mode 100644
index 00000000000..71b1d0c3b16
--- /dev/null
+++ b/pkgs/tools/text/kytea/gcc-O3.patch
@@ -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);