[SCM] musescore/master: Re-using old patch related to multiple processors and m68k.

[tiago at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 58e1b8578fa33db93a111a2209f6e9916044149a
Author: Tiago Bortoletto Vaz <tiago at debian.org>
Date:   Thu Jun 25 09:36:00 2015 -0400

    Re-using old patch related to multiple processors and m68k.

diff --git a/debian/patches/08-disable-multiple-jobs.patch b/debian/patches/08-disable-multiple-jobs.patch
index 8fc5f1f..462593b 100644
--- a/debian/patches/08-disable-multiple-jobs.patch
+++ b/debian/patches/08-disable-multiple-jobs.patch
@@ -1,19 +1,22 @@
-# Description: Avoid build error when processor = 0 from /proc/cpuinfo
-# Author: Tiago Bortoletto Vaz <tiago at debian.org>
+From: Tobias Toedter <toddy at debian.org>
+Subject: Detect multiple CPUs better
+ The current system of detecting multiple CPUs and using them for
+ multiple jobs in parallel is not very robust and results in a FTBFS on
+ some architectures.
 
 ---
  Makefile |    5 +++--
  1 file changed, 3 insertions(+), 2 deletions(-)
+
 --- a/Makefile
 +++ b/Makefile
-@@ -20,6 +20,10 @@
+@@ -37,7 +37,8 @@
+       cmake -DCMAKE_BUILD_TYPE=RELEASE	       \
+   	  -DCMAKE_INSTALL_PREFIX="${PREFIX}" ..;   \
+       make lrelease;                             \
+-      make -j ${CPUS};                           \
++      make;
++      #make -j ${CPUS};                           \
  
- REVISION  = `cat mscore/revision.h`
- CPUS      = `grep -c processor /proc/cpuinfo`
-+# Avoid a FTBFS when processor=0 (as in m68k)
-+ifeq ($(CPUS), 0)
-+  CPUS=1
-+endif
  
- PREFIX    = "/usr/local"
- #VERSION   = "2.0.1b-${REVISION}"
+ debug:

-- 
musescore packaging