fix qgis/QGIS#40996

qgis · Jan 26, 2021 · 7238782 · 7238782
1 parent 950ef59
commit 7238782
Showing 1 changed file with 16 additions and 4 deletions.
diff --git a/qgis_bundle/recipes/grass/recipe.sh b/qgis_bundle/recipes/grass/recipe.sh
@@ -232,11 +232,7 @@ function fix_binaries_grass() {
   # ETC
   for i in \
     clean_temp \
-    r.watershed/seg \
-    r.watershed/ram \
     lock \
-    lister/cell \
-    lister/vector \
     i.find
   do
     install_name_add_rpath @executable_path/../lib $GRASS_BUNDLE_DIR/etc/$i # from QGIS*.app/Contents/MacOS/grass78
@@ -249,6 +245,22 @@ function fix_binaries_grass() {
     fi
   done
 
+  for i in \
+    r.watershed/seg \
+    r.watershed/ram \
+    lister/cell \
+    lister/vector
+  do
+    install_name_add_rpath @executable_path/../../lib $GRASS_BUNDLE_DIR/etc/$i # from QGIS*.app/Contents/MacOS/grass78
+    install_name_add_rpath @executable_path/../../../../MacOS/lib $GRASS_BUNDLE_DIR/etc/$i # from QGIS*.app/Contents/Resources/
+    if [[ "$USE_SEM" == "true" ]]; then
+      sem -j+0 "fix_rpaths_grass $GRASS_BUNDLE_DIR/etc/$i"
+    else
+      echo "fixing $i"
+      fix_rpaths_grass $GRASS_BUNDLE_DIR/etc/$i
+    fi
+  done
+
   ### DONE
   if [[ "$USE_SEM" == "true" ]]; then
     sem --wait