cross-compile/macosx: Set DYLD_LIBRARY_PATH

After a prior change to the dynamic library path location users have
reported issues of nightly builds crashing on MacOS:

 - #1633
 - #1627
 - #1651
 - #1744

This change, mentioned by Andrea Leofreddi in #1633, hints PulseView and
sigrok-cli as to the correct location of dynamic libraries through the
addition of an environment variable to the startup script.

diff --git a/cross-compile/macosx/contrib/pulseview b/cross-compile/macosx/contrib/pulseview
index e41b4ad9d325299a7651d353170447f1fc01026d..a77ae3e3b3f740e4c9465b4a380929a11c49cb93 100755 (executable)
--- a/cross-compile/macosx/contrib/pulseview
+++ b/cross-compile/macosx/contrib/pulseview
@@ -20,6 +20,7 @@
 
 DIR="$(dirname "$0")"
 cd "$DIR"
+export DYLD_LIBRARY_PATH="../Frameworks"
 export PYTHONHOME="../Frameworks/Python.framework/Versions/3.7"
 export SIGROK_FIRMWARE_DIR="../share/sigrok-firmware"
 export SIGROKDECODE_DIR="../share/libsigrokdecode/decoders"

diff --git a/cross-compile/macosx/contrib/sigrok-cli b/cross-compile/macosx/contrib/sigrok-cli
index f3adbb0cc668387492e2880ce33c7f69e35d2e8c..3eb8ee2b1c80741c5cb073673fb3ae38007e5a9c 100755 (executable)
--- a/cross-compile/macosx/contrib/sigrok-cli
+++ b/cross-compile/macosx/contrib/sigrok-cli
@@ -20,6 +20,7 @@
 
 DIR="$(dirname "$0")"
 cd "$DIR"
+export DYLD_LIBRARY_PATH="../Frameworks"
 export PYTHONHOME="../Frameworks/Python.framework/Versions/3.7"
 export SIGROK_FIRMWARE_DIR="../share/sigrok-firmware"
 export SIGROKDECODE_DIR="../share/libsigrokdecode/decoders"