diff -Nru mysql-5.5-5.5.42/debian/changelog mysql-5.5-5.5.42/debian/changelog --- mysql-5.5-5.5.42/debian/changelog 2015-02-09 14:13:08.000000000 +0000 +++ mysql-5.5-5.5.42/debian/changelog 2015-03-29 12:45:50.000000000 +0000 @@ -1,3 +1,10 @@ +mysql-5.5 (5.5.42-1+rpi1) jessie-staging; urgency=medium + + * Disable parallel build due to build failure with no obvious case in build + log. + + -- Peter Michael Green Sun, 29 Mar 2015 12:45:19 +0000 + mysql-5.5 (5.5.42-1) unstable; urgency=medium [ James Page ] diff -Nru mysql-5.5-5.5.42/debian/rules mysql-5.5-5.5.42/debian/rules --- mysql-5.5-5.5.42/debian/rules 2015-02-09 10:33:49.000000000 +0000 +++ mysql-5.5-5.5.42/debian/rules 2015-03-29 12:45:50.000000000 +0000 @@ -34,12 +34,12 @@ # Parallel build support as adviced # at https://www.debian.org/doc/debian-policy/ch-source.html#s-debianrules-options ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) - NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) + #NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) # Placeholder code to implement max cpu count value checking # if [$(NUMJOBS) > $(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)] # then NUMJOBS = 0 # fi - MAKEFLAGS += -j $(NUMJOBS) + #MAKEFLAGS += -j $(NUMJOBS) endif # Add support for verbose builds