Fixes libjpeg-turbo dependecy under Ubuntu 16.04 (apache#14127)

* Fixes libjepgturbo dependency install on ubuntu * Enables libjpeg turbo on cpu build for testing
stephenrawls · Feb 16, 2019 · 6ea26de · 6ea26de
1 parent 3fe2a72
commit 6ea26de
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/ci/docker/install/ubuntu_core.sh b/ci/docker/install/ubuntu_core.sh
@@ -39,13 +39,19 @@ apt-get install -y \
     liblapack-dev \
     libopenblas-dev \
     libopencv-dev \
+    libturbojpeg \
     libzmq3-dev \
     ninja-build \
     software-properties-common \
     sudo \
     unzip \
     wget
 
+# Use libturbojpeg package as it is correctly compiled with -fPIC flag
+# https://github.com/HaxeFoundation/hashlink/issues/147 
+ln -s /usr/lib/x86_64-linux-gnu/libturbojpeg.so.0.1.0 /usr/lib/x86_64-linux-gnu/libturbojpeg.so
+
+
 # Note: we specify an exact cmake version to work around a cmake 3.10 CUDA 10 issue.
 # Reference: https://github.com/clab/dynet/issues/1457
 mkdir /opt/cmake && cd /opt/cmake

diff --git a/ci/docker/runtime_functions.sh b/ci/docker/runtime_functions.sh
@@ -365,6 +365,7 @@ build_ubuntu_cpu_openblas() {
         USE_BLAS=openblas             \
         USE_MKLDNN=0                  \
         USE_DIST_KVSTORE=1            \
+        USE_LIBJPEG_TURBO=1           \
         -j$(nproc)
 }