X-Git-Url: https://sigrok.org/gitweb/?a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fsigrok-native-macosx;h=7f6380e7c6ceb3f00a183ba3efdd0d02d7372b28;hb=a02bb31d3ef4b115470787b8a4ef21cf2bb033d7;hp=52adac278e3736e10110a2f4bb4f5d25fc9e01db;hpb=6a8ce4e0ef972f4c2e36e4abfa6dcf4d5f1322af;p=sigrok-util.git

diff --git a/cross-compile/macosx/sigrok-native-macosx b/cross-compile/macosx/sigrok-native-macosx
index 52adac2..7f6380e 100755
--- a/cross-compile/macosx/sigrok-native-macosx
+++ b/cross-compile/macosx/sigrok-native-macosx
@@ -44,21 +44,24 @@ PARALLEL="-j "`sysctl -n hw.ncpu`
 export CC=gcc
 export CXX=g++
 
-# Path to Qt binaries (needed for cmake to find the Qt libs).
-# export PATH="/usr/local/opt/qt/bin:$PATH" # Qt4
-export PATH=`brew list qt5 | grep bin | head -n 1 | xargs dirname`":$PATH" # Qt5
+# 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.
@@ -68,10 +71,12 @@ cd $BUILDDIR
 
 GIT_CLONE="git clone --depth=1"
 
+REPO_BASE="git://sigrok.org"
+
 # -----------------------------------------------------------------------------
 
 # libserialport
-$GIT_CLONE git://sigrok.org/libserialport
+$GIT_CLONE $REPO_BASE/libserialport
 cd libserialport
 ./autogen.sh
 mkdir build
@@ -83,7 +88,7 @@ cd ../..
 
 # libsigrok
 mkdir -p $PYPATH
-$GIT_CLONE git://sigrok.org/libsigrok
+$GIT_CLONE $REPO_BASE/libsigrok
 cd libsigrok
 ./autogen.sh
 mkdir build
@@ -95,7 +100,7 @@ $SB make check $V
 cd ../..
 
 # libsigrokdecode
-$GIT_CLONE git://sigrok.org/libsigrokdecode
+$GIT_CLONE $REPO_BASE/libsigrokdecode
 cd libsigrokdecode
 ./autogen.sh
 mkdir build
@@ -107,7 +112,7 @@ $SB make check $V
 cd ../..
 
 # sigrok-firmware
-$GIT_CLONE git://sigrok.org/sigrok-firmware
+$GIT_CLONE $REPO_BASE/sigrok-firmware
 cd sigrok-firmware
 ./autogen.sh
 mkdir build
@@ -118,7 +123,7 @@ make install $V
 cd ../..
 
 # sigrok-firmware-fx2lafw
-$GIT_CLONE git://sigrok.org/sigrok-firmware-fx2lafw
+$GIT_CLONE $REPO_BASE/sigrok-firmware-fx2lafw
 cd sigrok-firmware-fx2lafw
 ./autogen.sh
 mkdir build
@@ -130,7 +135,7 @@ make install $V
 cd ../..
 
 # sigrok-cli
-$GIT_CLONE git://sigrok.org/sigrok-cli
+$GIT_CLONE $REPO_BASE/sigrok-cli
 cd sigrok-cli
 ./autogen.sh
 mkdir build
@@ -141,7 +146,7 @@ make install $V
 cd ../..
 
 # PulseView
-$GIT_CLONE git://sigrok.org/pulseview
+$GIT_CLONE $REPO_BASE/pulseview
 cd pulseview
 mkdir build
 cd build