Skip to content

Commit

Permalink
Updated versions
Browse files Browse the repository at this point in the history
Updated zlib to 1.2.11 and OpenFST to 1.6.7.
  • Loading branch information
wincentbalin committed Mar 13, 2018
1 parent d4ae40c commit 088e2f7
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
7 changes: 5 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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" \
Expand Down
11 changes: 11 additions & 0 deletions thrax-features-h-mingw.patch
Original file line number Diff line number Diff line change
@@ -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;

0 comments on commit 088e2f7

Please sign in to comment.