Disable parallel support on !amd64 to avoid build failures on those architectures...

diff --git a/debian/changelog b/debian/changelog
index 370b0ee2d3630ccee81fc033cd4fe02b7ca32eb0..305bf3cd3da75038ea0b3cbd0c5082f4e9a35909 100644 (file)
--- 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 56ed22c8ba69cfbcf83f1e8cc90cf0056927b743..65219ebcc6dd852407073ff1fcf53d02eeb455e8 100755 (executable)
--- 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