The following commit has been merged in the ubuntu-quantal-3.6 branch:
commit d674082dd0d2f35d11ad84e5f3578a2d6a3831a1
Author: Bjoern Michaelsen <bjoern.michael...@canonical.com>
Date: Thu Apr 5 14:44:16 2012 +0200
adjust make version needed for parallel build to ubuntu
diff --git a/rules b/rules
index 6ec6072..8a07092 100755
--- a/rules
+++ b/rules
@@ -1160,7 +1160,7 @@ NUM_CPUS=$(shell echo "$(DEB_BUILD_OPTIONS) " | sed -n
's/^\(.* \)\?parallel=\([
AVAIL_CPUS := $(shell getconf _NPROCESSORS_ONLN 2>/dev/null || echo 1)
ifeq "$(PARALLEL_BUILD)" "y"
# http://bugs.debian.org/622644
- BUILD_DEPS += , make (>= 3.81-8.2)
+ BUILD_DEPS += , make (>= 3.81-8.1ubuntu1)
ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
endif
--
LibreOffice packaging repository
--
To UNSUBSCRIBE, email to debian-openoffice-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1sinyt-0005ps...@vasks.debian.org
