From: Brian 'Redbeard' Harrington <redacted>
Date: Sat, 10 Sep 2022 21:44:07 +0000 (-0700)
Subject: cross-compile/macosx: Set DYLD_LIBRARY_PATH
X-Git-Url: http://sigrok.org/gitweb/?p=sigrok-util.git;a=commitdiff_plain;h=8a9979e1f48dcdb1f1b1023be8e1ec2ac0f73a6e

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 e41b4ad..a77ae3e 100755
--- 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 f3adbb0..3eb8ee2 100755
--- 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"