Merge branch 'jpeg-8-osx-fix' into 'master'

Jpeg 8 osx fix



See merge request !13

ci/bootstrap.sh

@@ -58,12 +58,6 @@ if [ ! -d ${PREFIX} ]; then
   yellow_echo "[++] Bootstrapping conda installation at ${PREFIX}..."
   run_cmd ${CONDA_FOLDER}/bin/conda clean --lock
   run_cmd ${CONDA_FOLDER}/bin/conda create --prefix ${PREFIX} --file env.txt --yes
-
-  # Dirty fix to libjpeg.8 compilation issues:
-  # https://github.com/ContinuumIO/anaconda-issues/issues/1042
-  if [ "${ARCH}" == "macosx" ] && [ -e "${PREFIX}/lib/libjpeg.8.dylib" ]; then
-    run_cmd install_name_tool -id @rpath/libjpeg.8.dylib ${PREFIX}/lib/libjpeg.8.dylib
-  fi
   run_cmd ${CONDA_FOLDER}/bin/conda clean --lock
 else
   yellow_echo "[!!] Prefix directory ${PREFIX} exists, not re-installing..."