From: Uwe Hermann <redacted>
Date: Sun, 31 Aug 2014 22:00:40 +0000 (+0200)
Subject: sigrok-cross-android: Don't do parallel Python builds.
X-Git-Url: https://sigrok.org/gitaction?a=commitdiff_plain;h=510f5ccb4e0804b50a537cfacf6f742f0003c8ee;p=sigrok-util.git

sigrok-cross-android: Don't do parallel Python builds.

Don't do parallel Python builds, this doesn't seem to work well.
---

diff --git a/cross-compile/android/sigrok-cross-android b/cross-compile/android/sigrok-cross-android
index e682023..2004fb4 100755
--- a/cross-compile/android/sigrok-cross-android
+++ b/cross-compile/android/sigrok-cross-android
@@ -87,11 +87,12 @@ cd $BUILDDIR
 # -----------------------------------------------------------------------------
 
 # Build host Python before we start messing with the environment.
+# Don't do parallel builds, this doesn't seem to work well.
 $WGET http://python.org/ftp/python/$VER_PYTHON/Python-$VER_PYTHON.tar.xz
 tar xJf Python-$VER_PYTHON.tar.xz
 cd Python-$VER_PYTHON
 ./configure
-make python $PARALLEL
+make python
 mv python hostpython
 cd ..
 
@@ -120,13 +121,14 @@ patch < ../android.toolchain.cmake.patch android.toolchain.cmake
 # -----------------------------------------------------------------------------
 
 # Python (needed for libsigrokdecode)
+# Don't do parallel Python builds, this doesn't seem to work well.
 cd Python-$VER_PYTHON
 make distclean
 autoreconf
 patch -p1 < ../../Python-$VER_PYTHON.patch
 ac_cv_file__dev_ptmx=no ac_cv_file__dev_ptc=no ac_cv_func_pipe2=no ac_cv_func_fdatasync=no ac_cv_func_killpg=no ac_cv_func_waitid=no ac_cv_func_sigaltstack=no ./configure $C --build=x86_64-linux-gnu --disable-ipv6
 sed -i "s/^#zlib/zlib/g" Modules/Setup
-make PYTHON_FOR_BUILD=./hostpython install $PARALLEL
+make PYTHON_FOR_BUILD=./hostpython install
 cd ..
 
 # libiconv (needed for glib)