From: Don Armstrong <don@donarmstrong.com>
Date: Tue, 16 Sep 2014 21:42:39 +0000 (-0700)
Subject: Disable parallel support on !amd64 to avoid build failures on those architectures... 
X-Git-Tag: debian/2.18.2-2^0
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=137545653749bd6b79bd0fa9c00afc285014ae68;p=lilypond.git

Disable parallel support on !amd64 to avoid build failures on those architectures. This is a temporary fix; a real fix to the (possibly) broken makefiles needs to be written. (Closes: #760794)
---

diff --git a/debian/changelog b/debian/changelog
index 370b0ee2d3..305bf3cd3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lilypond (2.18.2-2) unstable; urgency=high
+
+  * Disable parallel support on !amd64 to avoid build failures on those
+    architectures. This is a temporary fix; a real fix to the (possibly)
+    broken makefiles needs to be written. (Closes: #760794)
+
+ -- Don Armstrong <don@debian.org>  Tue, 09 Sep 2014 08:18:49 -0700
+
 lilypond (2.18.2-1) unstable; urgency=high
 
   * New upstream version
diff --git a/debian/rules b/debian/rules
index 56ed22c8ba..65219ebcc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,13 +29,17 @@ endif
 endif
 
 DOC_OPTIONS := WEB_TARGETS="offline"
+ifneq (,$(filter $(shell dpkg-architecture -qDEB_HOST_ARCH), amd64)) 
 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	DOC_OPTIONS := $(DOC_OPTIONS) CPU_COUNT=$(firstword $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))))
+PARALLEL_OPTION := "--parallel"
+endif
+else
+PARALLEL_OPTION :=
 endif
 
 %:
-	dh $@ --parallel --with autotools-dev --with python2 --with quilt
-
+	dh $@ $(PARALLEL_OPTION) --with autotools-dev --with python2 --with quilt
 
 ## we need to nuke the parser files, because if there is a mistmatch
 ## between upstreams bison and our bison, the build will fail epically