diff --git a/Dockerfile b/Dockerfile index 5f52989..ce0f853 100644 --- a/Dockerfile +++ b/Dockerfile @@ -22,10 +22,10 @@ RUN DEBIAN_FRONTEND=noninteractive \ apt-get -y clean # Enter versions!!! -ENV ZLIB_VERSION 1.2.8 +ENV ZLIB_VERSION 1.2.11 ENV NCURSES_VERSION 6.0 ENV READLINE_VERSION 7.0 -ENV OPENFST_VERSION 1.6.6 +ENV OPENFST_VERSION 1.6.7 ENV OPENGRM_NGRAM_VERSION 1.3.4 ENV THRAX_VERSION 1.2.5 @@ -164,6 +164,9 @@ RUN patch -p0 < thrax-utildefs-cc-mingw.patch COPY thrax-random-generator-cc-mingw.patch . RUN patch -p0 < thrax-random-generator-cc-mingw.patch +COPY thrax-features-h-mingw.patch . +RUN patch -p0 < thrax-features-h-mingw.patch + RUN CPPFLAGS="-std=c++11 -I$C/include -DFST_NO_DYNAMIC_LINKING" \ CXXFLAGS="-O2 -static-libgcc -static-libstdc++" \ lt_cv_dlopen="LoadLibrary" \ diff --git a/thrax-features-h-mingw.patch b/thrax-features-h-mingw.patch new file mode 100644 index 0000000..a791139 --- /dev/null +++ b/thrax-features-h-mingw.patch @@ -0,0 +1,11 @@ +--- src/include/thrax/features.h.orig 2018-03-13 17:49:52.514675116 +0000 ++++ src/include/thrax/features.h 2018-03-13 17:50:34.955119225 +0000 +@@ -459,7 +459,7 @@ + return nullptr; + } + int64 label = generated_symbols->Find(featval); +- if (label == fst::SymbolTable::kNoSymbol) { ++ if (label == fst::kNoSymbol) { + std::cout << "Feature/value pair " << featval << " is not defined." + << std::endl; + delete generated_symbols; \ No newline at end of file