mkl: Replace @rpath/libiomp5.dylib with @loader_path/libiomp5.dylib i…

…n lib/libmkl_intel_thread.dylib Fixes: ContinuumIO/anaconda-issues#6423 and: JuliaPy/PyPlot.jl#315
AnacondaRecipes · Oct 13, 2017 · 91c5d09 · 91c5d09
1 parent feb5c57
commit 91c5d09
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/intel_repack/meta.yaml b/intel_repack/meta.yaml
@@ -1,5 +1,6 @@
 {% set version='2018.0.0' %}
 {% set buildnum='4' %}
+{% set dstbuildnum='5' %}
 {% set mkl_include_buildnum='2' %}
 {% set openmp_buildnum='7' %}
 
@@ -8,7 +9,7 @@ package:
   version: {{ version }}
 
 build:
-  number: {{ buildnum }}
+  number: {{ dstbuildnum }}
   binary_relocation: false
   detect_binary_files_with_prefix: false
 

diff --git a/intel_repack/repack.sh b/intel_repack/repack.sh
@@ -14,7 +14,12 @@ fi
 
 rm -rf $PREFIX/info
 
-if [[ `uname` == Darwin && -d $SRC_DIR/$PKG_NAME/lib ]]; then
-    # Strip off support for PPC - saves about 100 MB
-    python $RECIPE_DIR/deuniversalize.py --ignore-wrong-arch $SRC_DIR/$PKG_NAME/lib/* $PREFIX/lib
+if [[ $(uname) == Darwin && -d $SRC_DIR/$PKG_NAME/lib ]]; then
+  # Strip off support for PPC - saves about 100 MB
+  python $RECIPE_DIR/deuniversalize.py --ignore-wrong-arch $SRC_DIR/$PKG_NAME/lib/* $PREFIX/lib
+  if [[ -f ${PREFIX}/lib/libmkl_intel_thread.dylib ]]; then
+    # See: https://github.com/ContinuumIO/anaconda-issues/issues/6423
+    # and: https://github.com/JuliaPy/PyPlot.jl/issues/315
+    install_name_tool -change @rpath/libiomp5.dylib @loader_path/libiomp5.dylib ${PREFIX}/lib/libmkl_intel_thread.dylib
+  fi
 fi