X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fsigrok-native-macosx;h=7f6380e7c6ceb3f00a183ba3efdd0d02d7372b28;hb=61c873afc1d5be37b5592ab47a412605414ac76f;hp=5ba3de2a862e6e5ddba3e62de7b83ce152c60106;hpb=7323621e9311456b82723d4a7da565babdeb1bf8;p=sigrok-util.git

diff --git a/cross-compile/macosx/sigrok-native-macosx b/cross-compile/macosx/sigrok-native-macosx
index 5ba3de2..7f6380e 100755
--- a/cross-compile/macosx/sigrok-native-macosx
+++ b/cross-compile/macosx/sigrok-native-macosx
@@ -44,20 +44,24 @@ PARALLEL="-j "`sysctl -n hw.ncpu`
 export CC=gcc
 export CXX=g++
 
-# Path to Qt5 binaries (needed for cmake to find the Qt5 libs).
-export PATH=`brew list qt5 | grep bin | head -n 1 | xargs dirname`":$PATH"
+# We use Qt 5.5 in order to remain compatible with more versions of Mac OS X.
+QTVER=qt@5.5
 
-# Path to Python 2/3 pkg-config files.
-# In Homebrew, pkg-config files of "keg-only" formulas (Python is one of them)
-# aren't installed into /usr/local/lib/pkgconfig (we manually reference them).
-PY2=`brew list python | grep pkgconfig | head -n 1 | xargs dirname`
-PY3=`brew list python3 | grep pkgconfig | head -n 1 | xargs dirname`
+# Path to Qt5 binaries (needed for cmake to find the Qt5 libs).
+export PATH="$(brew --prefix $QTVER)/bin:$PATH"
 
 # You usually don't need to change anything below this line.
 
 # -----------------------------------------------------------------------------
 
-P="$PREFIX/lib/pkgconfig:$PY2:$PY3"
+# PKG_CONFIG_PATH will need to point to pkg-config files of Homebrew's
+# keg-only formulae.
+P="$PREFIX/lib/pkgconfig"
+for FORMULA in libffi python@2 python@3 "$QTVER"; do
+    P="$P:$(brew --prefix "$FORMULA")/lib/pkgconfig"
+done
+
+# Extra options to pass to configure.
 C="$C --prefix=$PREFIX"
 
 # Remove build directory contents (if any) and create a new build dir.