X-Git-Url: https://sigrok.org/gitweb/?p=sigrok-util.git;a=blobdiff_plain;f=cross-compile%2Fmacosx%2Fsigrok-native-macosx;h=357c0798526dbbc15216a2b34c4ab92b58ee0876;hp=9e341232bb867143c4e699c862df6cf570cebc32;hb=6afe728b63beb176c013969aa902482436efebed;hpb=06f3dccdeb8ce9773b7dc5cc2980b319d871f944

diff --git a/cross-compile/macosx/sigrok-native-macosx b/cross-compile/macosx/sigrok-native-macosx
index 9e34123..357c079 100755
--- a/cross-compile/macosx/sigrok-native-macosx
+++ b/cross-compile/macosx/sigrok-native-macosx
@@ -15,8 +15,7 @@
 ## GNU General Public License for more details.
 ##
 ## You should have received a copy of the GNU General Public License
-## along with this program; if not, write to the Free Software
-## Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+## along with this program; if not, see <http://www.gnu.org/licenses/>.
 ##
 
 set -e
@@ -30,8 +29,11 @@ BUILDDIR=./build
 # The path where the libsigrok Python bindings will be installed.
 PYPATH=$PREFIX/lib/python2.7/site-packages
 
+# Edit this to control verbose build output.
+# V="V=1 VERBOSE=1"
+
 # Edit this to enable/disable/modify parallel compiles.
-PARALLEL="-j 2"
+PARALLEL="-j "`sysctl -n hw.ncpu`
 
 # Uncomment the following lines to build with clang and run scan-build.
 # export CC=llvm-gcc
@@ -39,18 +41,17 @@ PARALLEL="-j 2"
 # SB="scan-build -k -v"
 
 # Uncomment the following lines to build with gcc/g++.
-export CC=gcc-4.9
-export CXX=g++-4.9
+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="/usr/local/opt/qt52/bin:$PATH" # Qt5
+# 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"
 
 # 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="/usr/local/opt/python/Frameworks/Python.framework/Versions/2.7/lib/pkgconfig"
-PY3="/usr/local/opt/python3/Frameworks/Python.framework/Versions/3.4/lib/pkgconfig"
+PY2=`brew list python | grep pkgconfig | head -n 1 | xargs dirname`
+PY3=`brew list python3 | grep pkgconfig | head -n 1 | xargs dirname`
 
 # You usually don't need to change anything below this line.
 
@@ -75,8 +76,8 @@ cd libserialport
 mkdir build
 cd build
 ../configure $C
-$SB make $PARALLEL
-make install
+$SB make $PARALLEL $V
+make install $V
 cd ../..
 
 # libsigrok
@@ -86,10 +87,10 @@ cd libsigrok
 ./autogen.sh
 mkdir build
 cd build
-PKG_CONFIG_PATH=$P ../configure $C --disable-java
-$SB make $PARALLEL
-PYTHONPATH=$PYPATH $SB make install
-$SB make check
+PKG_CONFIG_PATH=$P ../configure $C
+$SB make $PARALLEL $V
+PYTHONPATH=$PYPATH $SB make install $V
+$SB make check $V
 cd ../..
 
 # libsigrokdecode
@@ -99,9 +100,9 @@ cd libsigrokdecode
 mkdir build
 cd build
 PKG_CONFIG_PATH=$P ../configure $C
-$SB make $PARALLEL
-make install
-$SB make check
+$SB make $PARALLEL $V
+make install $V
+$SB make check $V
 cd ../..
 
 # sigrok-firmware
@@ -112,7 +113,7 @@ mkdir build
 cd build
 # Nothing gets cross-compiled here, we just need 'make install' basically.
 ../configure $C
-make install
+make install $V
 cd ../..
 
 # sigrok-firmware-fx2lafw
@@ -123,8 +124,8 @@ mkdir build
 cd build
 # We're building the fx2lafw firmware on the host, no need to cross-compile.
 ../configure $C
-make $PARALLEL
-make install
+make $PARALLEL $V
+make install $V
 cd ../..
 
 # sigrok-cli
@@ -134,8 +135,8 @@ cd sigrok-cli
 mkdir build
 cd build
 PKG_CONFIG_PATH=$P ../configure $C
-$SB make $PARALLEL
-make install
+$SB make $PARALLEL $V
+make install $V
 cd ../..
 
 # PulseView
@@ -144,8 +145,8 @@ cd pulseview
 mkdir build
 cd build
 PKG_CONFIG_PATH=$P $SB cmake -DCMAKE_INSTALL_PREFIX:PATH=$PREFIX -DDISABLE_WERROR=y -DENABLE_TESTS=y ..
-$SB make $PARALLEL
-make install
-$SB make test
+$SB make $PARALLEL $V
+make install $V
+$SB make test $V
 cd ../..