[SCM] LibreOffice packaging repository branch, ubuntu-precise-3.5, updated. libreoffice_3.5.2_rc2-1-100-gafff94e
The following commit has been merged in the ubuntu-precise-3.5 branch:
commit 1b6a0bcd3833224ad11e806ff0cd7242d366b964
Author: Bjoern Michaelsen <bjoern.michaelsen@canonical.com>
Date: Thu Apr 5 14:44:16 2012 +0200
reenable parallel build
diff --git a/rules b/rules
index ff181ed..11c4025 100755
--- a/rules
+++ b/rules
@@ -480,6 +480,7 @@ ifeq "$(DEB_VENDOR)" "Ubuntu"
RUN_MAKE_CHECK:=n
endif
VENDOR_PRESENTATION_TEMPLATES=ubuntu-templates
+ PARALLEL_BUILD=y
endif
CONFIGURE_FLAGS += $(foreach i, $(SYSTEM_STUFF),--with-system-$(i))
@@ -1165,7 +1166,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.82)
+ BUILD_DEPS += , make (>= 3.81-8.1ubuntu1)
ifneq "$(NUM_CPUS)" "$(AVAIL_CPUS)"
CONFIGURE_FLAGS += --with-num-cpus=$(NUM_CPUS)
endif
--
LibreOffice packaging repository
Reply to: